Menu
▾
▴
squeak-commits — CVS Commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(27) |
Apr
(11) |
May
(112) |
Jun
(8) |
Jul
(10) |
Aug
(68) |
Sep
(12) |
Oct
(3) |
Nov
(19) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(6) |
Feb
(15) |
Mar
(20) |
Apr
(22) |
May
(131) |
Jun
(27) |
Jul
(19) |
Aug
(207) |
Sep
(61) |
Oct
(27) |
Nov
(28) |
Dec
(21) |
| 2004 |
Jan
(7) |
Feb
(25) |
Mar
(14) |
Apr
(55) |
May
(15) |
Jun
(2) |
Jul
(14) |
Aug
(28) |
Sep
(29) |
Oct
|
Nov
|
Dec
|
|
From: Andreas R. <and...@us...> - 2002-05-06 10:36:28
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm
In directory usw-pr-cvs1:/tmp/cvs-serv21185/vm
Modified Files:
sqWin32.h sqWin32Exports.c sqWin32Prefs.c sqWin32Prefs.h
sqWin32Window.c
Log Message:
unified D3D and OpenGL support
Index: sqWin32.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32.h 4 May 2002 23:20:28 -0000 1.3
--- sqWin32.h 6 May 2002 10:36:25 -0000 1.4
***************
*** 284,287 ****
--- 284,288 ----
extern DWORD dwMemorySize; /* How much memory do we use? */
extern BOOL fUseDirectSound;/* Do we use DirectSound?! */
+ extern BOOL fUseOpenGL; /* Do we use OpenGL?! */
extern BOOL fReduceCPUUsage; /* Should we reduce CPU usage? */
extern BOOL fReduceCPUInBackground; /* reduce CPU usage when not active? */
Index: sqWin32Exports.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Exports.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqWin32Exports.c 4 May 2002 23:20:28 -0000 1.1
--- sqWin32Exports.c 6 May 2002 10:36:25 -0000 1.2
***************
*** 16,19 ****
--- 16,20 ----
extern void* firstMessageHook;
extern void* preMessageHook;
+ extern int fUseOpenGL;
void *os_exports[][3] = {
***************
*** 32,35 ****
--- 33,38 ----
{"","firstMessageHook", &firstMessageHook},
{"","preMessageHook", &preMessageHook},
+ {"","fUseOpenGL", &fUseOpenGL},
{NULL,NULL, NULL}
};
+
Index: sqWin32Prefs.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Prefs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32Prefs.c 4 May 2002 23:20:28 -0000 1.3
--- sqWin32Prefs.c 6 May 2002 10:36:25 -0000 1.4
***************
*** 121,124 ****
--- 121,131 ----
}
+ void SetB3DXUsesOpenGL() {
+ CheckMenuItem(vmPrefsMenu, ID_USEOPENGL, MF_BYCOMMAND |
+ (fUseOpenGL ? MF_CHECKED : MF_UNCHECKED));
+ WritePrivateProfileString(U_GLOBAL,TEXT("B3DXUsesOpenGL"),
+ fUseOpenGL ? U_ON : U_OFF,squeakIniName);
+ }
+
void LoadPreferences()
***************
*** 151,154 ****
--- 158,165 ----
GetPrivateProfileInt(U_GLOBAL,TEXT("PriorityBoost"),
fPriorityBoost,squeakIniName);
+
+ fUseOpenGL =
+ GetPrivateProfileInt(U_GLOBAL,TEXT("B3DXUsesOpenGL"),
+ fUseOpenGL,squeakIniName);
#endif
}
***************
*** 169,172 ****
--- 180,184 ----
SetShowAllocations();
SetPriorityBoost();
+ SetB3DXUsesOpenGL();
}
***************
*** 196,201 ****
TEXT("Allow file access"));
AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_IMAGEWRITE,
! TEXT("Allow image writes"));
! AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_SOCKETACCESS,
TEXT("Allow socket access"));
AppendMenu(pMenu, MF_STRING | MF_POPUP, (int)hMenu,
--- 208,212 ----
TEXT("Allow file access"));
AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_IMAGEWRITE,
! TEXT("Allow image writes")); AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_SOCKETACCESS,
TEXT("Allow socket access"));
AppendMenu(pMenu, MF_STRING | MF_POPUP, (int)hMenu,
***************
*** 206,209 ****
--- 217,222 ----
AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_DIRECTSOUND,
TEXT("Use DirectSound"));
+ AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_USEOPENGL,
+ TEXT("Use OpenGL (instead of D3D)"));
AppendMenu(hMenu,MF_STRING | MF_UNCHECKED, ID_DEFERUPDATES,
TEXT("Defer display update"));
***************
*** 334,337 ****
--- 347,354 ----
fPriorityBoost = !fPriorityBoost;
SetPriorityBoost();
+ break;
+ case ID_USEOPENGL:
+ fUseOpenGL = !fUseOpenGL;
+ SetB3DXUsesOpenGL();
break;
}
Index: sqWin32Prefs.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Prefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqWin32Prefs.h 28 Jan 2002 13:56:59 -0000 1.2
--- sqWin32Prefs.h 6 May 2002 10:36:25 -0000 1.3
***************
*** 24,28 ****
#define ID_PRIORITYBOOST 0x0110
! #define ID_PREF_LAST 0x0110
void TrackPrefsMenu(void);
--- 24,30 ----
#define ID_PRIORITYBOOST 0x0110
! #define ID_USEOPENGL 0x0120
!
! #define ID_PREF_LAST 0x0120
void TrackPrefsMenu(void);
Index: sqWin32Window.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sqWin32Window.c 4 May 2002 23:45:44 -0000 1.5
--- sqWin32Window.c 6 May 2002 10:36:25 -0000 1.6
***************
*** 91,94 ****
--- 91,95 ----
BOOL fReduceCPUInBackground = 0; /* Should we reduce CPU usage when not active? */
BOOL fUseDirectSound = 1; /* Do we use DirectSound?! */
+ BOOL fUseOpenGL = 0; /* Do we use OpenGL vs. D3D?! */
BOOL fPriorityBoost = 1;
|
|
From: Andreas R. <and...@us...> - 2002-05-06 10:36:28
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory usw-pr-cvs1:/tmp/cvs-serv21185/misc Modified Files: Squeak.dsp Log Message: unified D3D and OpenGL support Index: Squeak.dsp =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Squeak.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Squeak.dsp 5 May 2002 18:35:40 -0000 1.4 --- Squeak.dsp 6 May 2002 10:36:25 -0000 1.5 *************** *** 54,58 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 !ELSEIF "$(CFG)" == "Squeak - Win32 Debug" --- 54,58 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib opengl32.lib /nologo /subsystem:windows /machine:I386 !ELSEIF "$(CFG)" == "Squeak - Win32 Debug" *************** *** 293,296 **** --- 293,300 ---- SOURCE=..\plugins\B3DAcceleratorPlugin\sqWin32D3D.c + # End Source File + # Begin Source File + + SOURCE=..\plugins\B3DAcceleratorPlugin\sqWin32DualB3DX.c # End Source File # Begin Source File |
|
From: Andreas R. <and...@us...> - 2002-05-05 20:33:14
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory usw-pr-cvs1:/tmp/cvs-serv13453 Removed Files: platform.exports Log Message: removed platform.exports --- platform.exports DELETED --- |
|
From: Andreas R. <and...@us...> - 2002-05-05 18:56:11
|
Update of /cvsroot/squeak/squeak/platforms/Cross/vm
In directory usw-pr-cvs1:/tmp/cvs-serv21660
Modified Files:
sqVirtualMachine.h
Log Message:
added 64 bit ints for MSVC
Index: sqVirtualMachine.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/vm/sqVirtualMachine.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqVirtualMachine.h 31 Jan 2002 21:32:28 -0000 1.3
--- sqVirtualMachine.h 5 May 2002 18:56:07 -0000 1.4
***************
*** 178,185 ****
* long long types but it suffices for the moment
*/
! #ifndef ACORN
! #define squeakInt64 long long
! #else
#define squeakInt64 long int
#endif
int (*positive64BitIntegerFor)(squeakInt64 integerValue);
--- 178,187 ----
* long long types but it suffices for the moment
*/
! #ifdef ACORN
#define squeakInt64 long int
+ #elif _MSC_VER
+ #define squeakInt64 __int64
+ #else
+ #define squeakInt64 long long
#endif
int (*positive64BitIntegerFor)(squeakInt64 integerValue);
|
|
From: Andreas R. <and...@us...> - 2002-05-05 18:52:59
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video
In directory usw-pr-cvs1:/tmp/cvs-serv20833/libmpeg/video
Modified Files:
idct.c output.c slice.c
Log Message:
few fixes for MSVC builds of libmpeg
Index: idct.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** idct.c 24 Oct 2001 23:12:16 -0000 1.1.1.1
--- idct.c 5 May 2002 18:52:56 -0000 1.2
***************
*** 33,36 ****
--- 33,41 ----
#include <stdlib.h>
+ #ifdef _MSC_VER
+ /* inline is unrecognized keyword in C mode of MSVC */
+ #define inline __inline
+ #endif
+
/**********************************************************/
/* inverse two dimensional DCT, Chen-Wang algorithm */
Index: output.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/output.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** output.c 24 Oct 2001 23:12:18 -0000 1.1.1.1
--- output.c 5 May 2002 18:52:56 -0000 1.2
***************
*** 46,49 ****
--- 46,52 ----
int doClippingArrays=1;
+ static unsigned char mpeg3_601_to_rgb[256];
+
+ #ifdef HAVE_MMX
static long long mpeg3_MMX_0 = 0L;
***************
*** 65,70 ****
static unsigned short mpeg3_MMX_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; /*dd 003e0 03e0h, 003e003e0h */
- static unsigned char mpeg3_601_to_rgb[256];
-
/* Algorithm */
/* r = (int)(*y + 1.371 * (*cr - 128)); */
--- 68,71 ----
***************
*** 72,76 ****
/* b = (int)(*y + 1.732 * (*cb - 128)); */
- #ifdef HAVE_MMX
inline void mpeg3video_rgb16_mmx(unsigned char *lum,
unsigned char *cr,
--- 73,76 ----
Index: slice.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/slice.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** slice.c 24 Oct 2001 23:12:21 -0000 1.1.1.1
--- slice.c 5 May 2002 18:52:56 -0000 1.2
***************
*** 37,41 ****
--- 37,43 ----
#include <stdlib.h>
+ #ifdef HAVE_MMX
static unsigned long long MMX_128 = 0x80008000800080LL;
+ #endif
int mpeg3_new_slice_buffer(mpeg3_slice_buffer_t *slice_buffer)
|
|
From: Andreas R. <and...@us...> - 2002-05-05 18:52:59
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg In directory usw-pr-cvs1:/tmp/cvs-serv20833/libmpeg Modified Files: mpeg3private.h Log Message: few fixes for MSVC builds of libmpeg Index: mpeg3private.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mpeg3private.h 24 Oct 2001 23:12:13 -0000 1.1.1.1 --- mpeg3private.h 5 May 2002 18:52:56 -0000 1.2 *************** *** 20,23 **** --- 20,28 ---- #endif + #ifdef _MSC_VER + /* disallow INLINE since those functions cannot be linked */ + #undef INLINE + #define INLINE + #endif /* use pthreads? */ |
|
From: Andreas R. <and...@us...> - 2002-05-05 18:35:43
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory usw-pr-cvs1:/tmp/cvs-serv16524 Modified Files: Squeak.dsp Log Message: updated msvc project Index: Squeak.dsp =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Squeak.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Squeak.dsp 5 May 2002 17:34:38 -0000 1.3 --- Squeak.dsp 5 May 2002 18:35:40 -0000 1.4 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "../../vm" /I "..\vm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "SQUEAK_BUILTIN_PLUGIN" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "../../vm" /I "..\vm" /D "NDEBUG" /D "WIN32_FILE_SUPPORT" /D "SQUEAK_BUILTIN_PLUGIN" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_STD_FILE_SUPPORT" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 70,74 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "./../../vm" /I "./vm" /I "..\vm" /D "_DEBUG" /D "SQUEAK_BUILTIN_PLUGIN" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 70,74 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "./../../vm" /I "./vm" /I "..\vm" /D "_DEBUG" /D "SQUEAK_BUILTIN_PLUGIN" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WIN32_FILE_SUPPORT" /D "NO_STD_FILE_SUPPORT" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
|
From: Andreas R. <and...@us...> - 2002-05-05 18:08:42
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm
In directory usw-pr-cvs1:/tmp/cvs-serv9645
Modified Files:
sqPlatformSpecific.h sqWin32Alloc.c
Log Message:
updates for large image files
Index: sqPlatformSpecific.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqPlatformSpecific.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sqPlatformSpecific.h 5 May 2002 17:34:39 -0000 1.6
--- sqPlatformSpecific.h 5 May 2002 18:08:38 -0000 1.7
***************
*** 35,42 ****
int sqImageFileClose(sqImageFile h);
sqImageFile sqImageFileOpen(char *fileName, char *mode);
! int sqImageFilePosition(sqImageFile h);
! int sqImageFileRead(void *ptr, int sz, int count, sqImageFile h);
! int sqImageFileSeek(sqImageFile h, int pos);
! int sqImageFileWrite(void *ptr, int sz, int count, sqImageFile h);
#endif /* WIN32_FILE_SUPPORT */
--- 35,42 ----
int sqImageFileClose(sqImageFile h);
sqImageFile sqImageFileOpen(char *fileName, char *mode);
! squeakFileOffsetType sqImageFilePosition(sqImageFile h);
! size_t sqImageFileRead(void *ptr, size_t sz, size_t count, sqImageFile h);
! squeakFileOffsetType sqImageFileSeek(sqImageFile h, squeakFileOffsetType pos);
! size_t sqImageFileWrite(void *ptr, size_t sz, size_t count, sqImageFile h);
#endif /* WIN32_FILE_SUPPORT */
Index: sqWin32Alloc.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Alloc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32Alloc.c 4 May 2002 23:20:28 -0000 1.3
--- sqWin32Alloc.c 5 May 2002 18:08:38 -0000 1.4
***************
*** 64,71 ****
/* Here, we only reserve the maximum memory to be used
It will later be committed during actual access */
! maxReserved = 2*1024*1024*1024;
/* Ugh. Note. Some people really *are* crazy...
... as if 512MB wouldn't be enough, no sir...
! ... so we give you all we have (2GB) ...
... except a bit for the C allocator ...
*/
--- 64,71 ----
/* Here, we only reserve the maximum memory to be used
It will later be committed during actual access */
! maxReserved = 1*1024*1024*1024;
/* Ugh. Note. Some people really *are* crazy...
... as if 512MB wouldn't be enough, no sir...
! ... so we give you all we have (1GB) ...
... except a bit for the C allocator ...
*/
|
|
From: Andreas R. <and...@us...> - 2002-05-05 18:08:20
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/FilePlugin
In directory usw-pr-cvs1:/tmp/cvs-serv9561
Modified Files:
sqWin32FilePrims.c
Log Message:
updates for large image files
Index: sqWin32FilePrims.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sqWin32FilePrims.c 5 May 2002 17:18:02 -0000 1.5
--- sqWin32FilePrims.c 5 May 2002 18:08:16 -0000 1.6
***************
*** 277,286 ****
}
! int sqImageFilePosition(sqImageFile h)
{
! return (int)SetFilePointer((HANDLE)(h-1), 0, NULL, FILE_CURRENT);
}
! int sqImageFileRead(void *ptr, int sz, int count, sqImageFile h)
{
DWORD dwReallyRead;
--- 277,289 ----
}
! squeakFileOffsetType sqImageFilePosition(sqImageFile h)
{
! win32FileOffset ofs;
! ofs.offset = 0;
! ofs.dwLow = SetFilePointer((HANDLE)(h-1), 0, &ofs.dwHigh, FILE_CURRENT);
! return ofs.offset;
}
! size_t sqImageFileRead(void *ptr, size_t sz, size_t count, sqImageFile h)
{
DWORD dwReallyRead;
***************
*** 299,317 ****
}
! int sqImageFileSeek(sqImageFile h, int pos)
{
! return (int) SetFilePointer((HANDLE)(h-1), pos, NULL, FILE_BEGIN);
}
! int sqImageFileWrite(void *ptr, int sz, int count, sqImageFile h)
{
DWORD dwReallyWritten;
WriteFile((HANDLE)(h-1), (LPVOID) ptr, count*sz, &dwReallyWritten, NULL);
! return (int) (dwReallyWritten / sz);
}
! int sqImageFileSize(sqImageFile h)
{
! return GetFileSize((HANDLE)(h-1), NULL);
}
--- 302,326 ----
}
! squeakFileOffsetType sqImageFileSeek(sqImageFile h, squeakFileOffsetType pos)
{
! win32FileOffset ofs;
! ofs.offset = pos;
! ofs.dwLow = SetFilePointer((HANDLE)(h-1), ofs.dwLow, &ofs.dwHigh, FILE_BEGIN);
! return ofs.offset;
}
! size_t sqImageFileWrite(void *ptr, size_t sz, size_t count, sqImageFile h)
{
DWORD dwReallyWritten;
WriteFile((HANDLE)(h-1), (LPVOID) ptr, count*sz, &dwReallyWritten, NULL);
! return (size_t) (dwReallyWritten / sz);
}
! squeakFileOffsetType sqImageFileSize(sqImageFile h)
{
! win32FileOffset ofs;
! ofs.offset = 0;
! ofs.dwLow = GetFileSize((HANDLE)(h-1), &ofs.dwHigh);
! return ofs.offset;
}
|
|
From: Andreas R. <and...@us...> - 2002-05-05 17:34:41
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm In directory usw-pr-cvs1:/tmp/cvs-serv616/vm Modified Files: sqPlatformSpecific.h Log Message: Fixed MSVC compilation Index: sqPlatformSpecific.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqPlatformSpecific.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sqPlatformSpecific.h 5 May 2002 17:18:02 -0000 1.5 --- sqPlatformSpecific.h 5 May 2002 17:34:39 -0000 1.6 *************** *** 17,21 **** #ifdef _MSC_VER ! #define squeakFileOffsetType __uint64 #else #define squeakFileOffsetType unsigned long long --- 17,21 ---- #ifdef _MSC_VER ! #define squeakFileOffsetType __int64 #else #define squeakFileOffsetType unsigned long long |
|
From: Andreas R. <and...@us...> - 2002-05-05 17:34:41
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/DropPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv616/plugins/DropPlugin
Modified Files:
sqWin32Drop.c
Log Message:
Fixed MSVC compilation
Index: sqWin32Drop.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/DropPlugin/sqWin32Drop.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqWin32Drop.c 4 May 2002 23:20:27 -0000 1.1
--- sqWin32Drop.c 5 May 2002 17:34:38 -0000 1.2
***************
*** 25,28 ****
--- 25,29 ----
int sqSecFileAccessCallback(void *function) {
+ #ifndef _MSC_VER
#warning "REMOVE THIS NONSENSE"
#warning "REMOVE THIS NONSENSE"
***************
*** 30,33 ****
--- 31,35 ----
#warning "REMOVE THIS NONSENSE"
#warning "REMOVE THIS NONSENSE"
+ #endif
return 0;
}
***************
*** 607,611 ****
BITMAPINFO bmi;
ENHMETAHEADER header;
- int size;
DPRINTF(("Success\n"));
--- 609,612 ----
|
|
From: Andreas R. <and...@us...> - 2002-05-05 17:34:41
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory usw-pr-cvs1:/tmp/cvs-serv616/misc Modified Files: Squeak.dsp Log Message: Fixed MSVC compilation Index: Squeak.dsp =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Squeak.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Squeak.dsp 5 May 2002 17:20:32 -0000 1.2 --- Squeak.dsp 5 May 2002 17:34:38 -0000 1.3 *************** *** 39,44 **** # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" --- 39,44 ---- # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\Release" ! # PROP Intermediate_Dir "..\Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" *************** *** 65,70 **** # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" --- 65,70 ---- # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\Debug" ! # PROP Intermediate_Dir "..\Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" *************** *** 103,106 **** --- 103,110 ---- # Begin Source File + SOURCE=.\Squeak.rc + # End Source File + # Begin Source File + SOURCE=..\vm\sqVirtualMachine.c # SUBTRACT CPP /D "SQUEAK_BUILTIN_PLUGIN" *************** *** 219,222 **** --- 223,238 ---- # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + # Begin Source File + + SOURCE=.\squeak.ico + # End Source File + # Begin Source File + + SOURCE=.\squeak2.ico + # End Source File + # Begin Source File + + SOURCE=.\squeak3.ico + # End Source File # End Group # Begin Group "Plugins (internal)" *************** *** 906,909 **** --- 922,926 ---- SOURCE=..\plugins\Mpeg3Plugin\libmpeg\video\mmxtest.c + # ADD CPP /I "../plugins/Mpeg3Plugin/libmpeg" /I "../plugins/Mpeg3Plugin/libmpeg/audio" /I "../plugins/Mpeg3Plugin/libmpeg/video" # End Source File # Begin Source File |
|
From: Andreas R. <and...@us...> - 2002-05-05 17:20:35
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory usw-pr-cvs1:/tmp/cvs-serv29623 Modified Files: Squeak.dsp Removed Files: Squeak.dsw Log Message: removed msvc project workspace Index: Squeak.dsp =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Squeak.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Squeak.dsp 24 Oct 2001 23:14:22 -0000 1.1.1.1 --- Squeak.dsp 5 May 2002 17:20:32 -0000 1.2 *************** *** 44,52 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "../generated" /I "./" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WIN32_FILE_SUPPORT" /D "LSB_FIRST" /FAcs /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 44,52 ---- [...1545 lines suppressed...] + # End Source File + # Begin Source File + + SOURCE=..\plugins\UUIDPlugin\UUIDPlugin.c + # End Source File + # Begin Source File + + SOURCE=..\plugins\UUIDPlugin\UUIDPlugin.h + # End Source File + # End Group + # Begin Group "ZipPlugin" + + # PROP Default_Filter "" + # Begin Source File + + SOURCE=..\plugins\ZipPlugin\ZipPlugin.c + # End Source File + # End Group # End Group # End Target --- Squeak.dsw DELETED --- |
|
From: Andreas R. <and...@us...> - 2002-05-05 17:18:06
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm
In directory usw-pr-cvs1:/tmp/cvs-serv28838/vm
Modified Files:
sqPlatformSpecific.h sqWin32Directory.c
Log Message:
added large file support
Index: sqPlatformSpecific.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqPlatformSpecific.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqPlatformSpecific.h 28 Jan 2002 14:23:48 -0000 1.4
--- sqPlatformSpecific.h 5 May 2002 17:18:02 -0000 1.5
***************
*** 16,21 ****
#include "sqWin32Alloc.h"
! #define squeakFileOffsetType int
! #define size_t int
#ifdef WIN32_FILE_SUPPORT
--- 16,24 ----
#include "sqWin32Alloc.h"
! #ifdef _MSC_VER
! #define squeakFileOffsetType __uint64
! #else
! #define squeakFileOffsetType unsigned long long
! #endif
#ifdef WIN32_FILE_SUPPORT
Index: sqWin32Directory.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Directory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqWin32Directory.c 4 May 2002 23:20:28 -0000 1.2
--- sqWin32Directory.c 5 May 2002 17:18:02 -0000 1.3
***************
*** 35,38 ****
--- 35,46 ----
static TCHAR DOT[] = TEXT(".");
+ typedef union {
+ struct {
+ DWORD dwLow;
+ DWORD dwHigh;
+ };
+ squeakFileOffsetType offset;
+ } win32FileOffset;
+
DWORD convertToSqueakTime(SYSTEMTIME st)
{ DWORD secs;
***************
*** 70,74 ****
int dir_Lookup(char *pathString, int pathStringLength, int index,
/* outputs: */ char *name, int *nameLength, int *creationDate, int *modificationDate,
! int *isDirectory, int *sizeIfFile)
{
/* Lookup the index-th entry of the directory with the given path, starting
--- 78,82 ----
int dir_Lookup(char *pathString, int pathStringLength, int index,
/* outputs: */ char *name, int *nameLength, int *creationDate, int *modificationDate,
! int *isDirectory, squeakFileOffsetType *sizeIfFile)
{
/* Lookup the index-th entry of the directory with the given path, starting
***************
*** 192,198 ****
if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
*isDirectory= true;
! else
! *sizeIfFile= findData.nFileSizeLow; /* assuming that this is enough ;-) */
!
return ENTRY_FOUND;
}
--- 200,209 ----
if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
*isDirectory= true;
! else {
! win32FileOffset ofs;
! ofs.dwLow = findData.nFileSizeLow;
! ofs.dwHigh = findData.nFileSizeHigh;
! *sizeIfFile = ofs.offset;
! }
return ENTRY_FOUND;
}
|
|
From: Andreas R. <and...@us...> - 2002-05-05 17:18:06
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/FilePlugin
In directory usw-pr-cvs1:/tmp/cvs-serv28838/plugins/FilePlugin
Modified Files:
sqWin32FilePrims.c
Log Message:
added large file support
Index: sqWin32FilePrims.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqWin32FilePrims.c 4 May 2002 23:20:27 -0000 1.4
--- sqWin32FilePrims.c 5 May 2002 17:18:02 -0000 1.5
***************
*** 49,53 ****
/*** Variables ***/
int thisSession = 0;
! extern unsigned char *memory;
int sqFileThisSession(void) {
--- 49,62 ----
/*** Variables ***/
int thisSession = 0;
! //extern unsigned char *memory;
!
! typedef union {
! struct {
! DWORD dwLow;
! DWORD dwHigh;
! };
! squeakFileOffsetType offset;
! } win32FileOffset;
!
int sqFileThisSession(void) {
***************
*** 56,63 ****
int sqFileAtEnd(SQFile *f) {
/* Return true if the file's read/write head is at the end of the file. */
if (!sqFileValid(f)) return success(false);
! return
! SetFilePointer(FILE_HANDLE(f), 0, NULL, FILE_CURRENT) == (DWORD) f->fileSize;
}
--- 65,74 ----
int sqFileAtEnd(SQFile *f) {
+ win32FileOffset ofs;
/* Return true if the file's read/write head is at the end of the file. */
if (!sqFileValid(f)) return success(false);
! ofs.offset = 0;
! ofs.dwLow = SetFilePointer(FILE_HANDLE(f), 0, &ofs.dwHigh, FILE_CURRENT);
! return ofs.offset == f->fileSize;
}
***************
*** 87,98 ****
}
! int sqFileGetPosition(SQFile *f) {
/* Return the current position of the file's read/write head. */
-
- DWORD position;
-
if (!sqFileValid(f)) return success(false);
! position = SetFilePointer(FILE_HANDLE(f), 0, NULL, FILE_CURRENT);
! return (int) position;
}
--- 98,108 ----
}
! squeakFileOffsetType sqFileGetPosition(SQFile *f) {
! win32FileOffset ofs;
/* Return the current position of the file's read/write head. */
if (!sqFileValid(f)) return success(false);
! ofs.offset = 0;
! ofs.dwLow = SetFilePointer(FILE_HANDLE(f), 0, &ofs.dwHigh, FILE_CURRENT);
! return ofs.offset;
}
***************
*** 133,140 ****
return success(false);
} else {
f->sessionID = thisSession;
FILE_HANDLE(f) = h;
/* compute and cache file size */
! f->fileSize = SetFilePointer(h, 0, NULL, FILE_END);
SetFilePointer(h, 0, NULL, FILE_BEGIN);
f->writable = writeFlag ? true : false;
--- 143,153 ----
return success(false);
} else {
+ win32FileOffset ofs;
f->sessionID = thisSession;
FILE_HANDLE(f) = h;
/* compute and cache file size */
! ofs.offset = 0;
! ofs.dwLow = SetFilePointer(h, 0, &ofs.dwHigh, FILE_END);
! f->fileSize = ofs.offset;
SetFilePointer(h, 0, NULL, FILE_BEGIN);
f->writable = writeFlag ? true : false;
***************
*** 143,147 ****
}
! int sqFileReadIntoAt(SQFile *f, int count, int byteArrayIndex, int startIndex) {
/* Read count bytes from the given file into byteArray starting at
startIndex. byteArray is the address of the first byte of a
--- 156,160 ----
}
! size_t sqFileReadIntoAt(SQFile *f, size_t count, int byteArrayIndex, size_t startIndex) {
/* Read count bytes from the given file into byteArray starting at
startIndex. byteArray is the address of the first byte of a
***************
*** 167,179 ****
}
! int sqFileSetPosition(SQFile *f, int position)
{
/* Set the file's read/write head to the given position. */
if (!sqFileValid(f)) return success(false);
! SetFilePointer(FILE_HANDLE(f), position, NULL, FILE_BEGIN);
return 1;
}
! int sqFileSize(SQFile *f) {
/* Return the length of the given file. */
--- 180,194 ----
}
! int sqFileSetPosition(SQFile *f, squeakFileOffsetType position)
{
+ win32FileOffset ofs;
+ ofs.offset = position;
/* Set the file's read/write head to the given position. */
if (!sqFileValid(f)) return success(false);
! SetFilePointer(FILE_HANDLE(f), ofs.dwLow, &ofs.dwHigh, FILE_BEGIN);
return 1;
}
! squeakFileOffsetType sqFileSize(SQFile *f) {
/* Return the length of the given file. */
***************
*** 189,195 ****
}
! int sqFileTruncate(SQFile *f, int offset) {
if (!sqFileValid(f)) return success(false);
! SetFilePointer(FILE_HANDLE(f), offset, NULL, FILE_BEGIN);
if(!SetEndOfFile(FILE_HANDLE(f))) return 0;
return 1;
--- 204,212 ----
}
! int sqFileTruncate(SQFile *f, squeakFileOffsetType offset) {
! win32FileOffset ofs;
! ofs.offset = offset;
if (!sqFileValid(f)) return success(false);
! SetFilePointer(FILE_HANDLE(f), ofs.dwLow, &ofs.dwHigh, FILE_BEGIN);
if(!SetEndOfFile(FILE_HANDLE(f))) return 0;
return 1;
***************
*** 203,207 ****
}
! int sqFileWriteFromAt(SQFile *f, int count, int byteArrayIndex, int startIndex) {
/* Write count bytes to the given writable file starting at startIndex
in the given byteArray. (See comment in sqFileReadIntoAt for interpretation
--- 220,224 ----
}
! size_t sqFileWriteFromAt(SQFile *f, size_t count, int byteArrayIndex, size_t startIndex) {
/* Write count bytes to the given writable file starting at startIndex
in the given byteArray. (See comment in sqFileReadIntoAt for interpretation
***************
*** 209,217 ****
*/
DWORD dwReallyWritten;
if (!(sqFileValid(f) && f->writable)) return success(false);
WriteFile(FILE_HANDLE(f), (LPVOID) (byteArrayIndex + startIndex), count, &dwReallyWritten, NULL);
/* update file size */
! f->fileSize = GetFileSize(FILE_HANDLE(f), NULL);
if ((int)dwReallyWritten != count) {
--- 226,237 ----
*/
DWORD dwReallyWritten;
+ win32FileOffset ofs;
if (!(sqFileValid(f) && f->writable)) return success(false);
WriteFile(FILE_HANDLE(f), (LPVOID) (byteArrayIndex + startIndex), count, &dwReallyWritten, NULL);
/* update file size */
! ofs.offset = 0;
! ofs.dwLow = GetFileSize(FILE_HANDLE(f), &ofs.dwHigh);
! f->fileSize = ofs.offset;
if ((int)dwReallyWritten != count) {
|
|
From: Andreas R. <and...@us...> - 2002-05-05 17:18:06
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory usw-pr-cvs1:/tmp/cvs-serv28838/misc Modified Files: makefile.cvs Log Message: added large file support Index: makefile.cvs =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/makefile.cvs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.cvs 5 May 2002 00:18:53 -0000 1.2 --- makefile.cvs 5 May 2002 17:18:02 -0000 1.3 *************** *** 61,62 **** --- 61,64 ---- cvs -z3 -d:pserver:ano...@cv...:/cvsroot/squeak export -r HEAD win32-solo Cross-solo + diff: + cvs -z3 -d:pserver:ano...@cv...:/cvsroot/squeak diff |
|
From: Lex S. <lex...@us...> - 2002-05-05 12:29:58
|
Update of /cvsroot/squeak/squeak/platforms/unix/plugins/SocketPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv9675
Modified Files:
sqUnixSocket.c
Log Message:
redo signalling of CONN_NOTIFY. Now CONN_NOTIFY is turned
on in (and only in) sqSocketConnectionStatus.
Index: sqUnixSocket.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqUnixSocket.c 1 May 2002 04:24:33 -0000 1.3
--- sqUnixSocket.c 5 May 2002 12:29:55 -0000 1.4
***************
*** 516,520 ****
if(s_errno != 0) {
/* connection failure */
- pss->pendingEvents |= CONN_NOTIFY;
pss->sockError = s_errno;
pss->sockState = Unconnected;
--- 516,519 ----
***************
*** 668,678 ****
/* return the state of a socket */
-
int sqSocketConnectionStatus(SocketPtr s)
{
if (!socketValid(s))
return -1;
!
! return SOCKETSTATE(s);
}
--- 667,682 ----
/* return the state of a socket */
int sqSocketConnectionStatus(SocketPtr s)
{
+ int state;
+
if (!socketValid(s))
return -1;
!
! state= SOCKETSTATE(s);
! if(state == WaitingForConnection)
! PSP(s)->pendingEvents|= CONN_NOTIFY;
!
! return state;
}
***************
*** 753,757 ****
/* connection completed synchronously */
SOCKETSTATE(s)= Connected;
- notify(PSP(s), CONN_NOTIFY);
}
else
--- 757,760 ----
***************
*** 761,765 ****
/* asynchronous connection in progress */
SOCKETSTATE(s)= WaitingForConnection;
- PSP(s)->pendingEvents|= CONN_NOTIFY;
aioHandle(SOCKET(s), connectHandler, PSP(s), AIO_WR); /* => connect() done */
--- 764,767 ----
***************
*** 771,779 ****
SOCKETSTATE(s)= Unconnected;
SOCKETERROR(s)= errno;
- notify(PSP(s), CONN_NOTIFY);
}
}
}
- /* notify(PSP(s), 0); */
}
--- 773,779 ----
|
|
From: Andreas R. <and...@us...> - 2002-05-05 12:23:53
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv8545
Modified Files:
sqWin32OpenGL.h
Log Message:
restored include of GL/gl.h which got lost in synchronization
Index: sqWin32OpenGL.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32OpenGL.h 4 May 2002 23:20:27 -0000 1.3
--- sqWin32OpenGL.h 5 May 2002 12:23:50 -0000 1.4
***************
*** 4,7 ****
--- 4,9 ----
#define MAX_RENDERER 16
+ #include <GL/gl.h>
+
typedef struct glRenderer {
GLint bufferRect[4];
|
|
From: Andreas R. <and...@us...> - 2002-05-05 11:58:52
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg
In directory usw-pr-cvs1:/tmp/cvs-serv3927
Modified Files:
changesForSqueak.c
Log Message:
changed true/false into 1/0 since C doesnt know true or false keywords
Index: changesForSqueak.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** changesForSqueak.c 27 Dec 2001 23:14:13 -0000 1.3
--- changesForSqueak.c 5 May 2002 11:58:47 -0000 1.4
***************
*** 112,122 ****
c2 = c2 - ('a' - 'A');
}
! if (c1 != c2) return false;
}
! return true;
}
int strcasecmp (const char *str1, const char *str2) {
! if (strlen(str1) != strlen(str2)) return false;
return strncasecmp(str1,str2,strlen(str1));
}
--- 112,122 ----
c2 = c2 - ('a' - 'A');
}
! if (c1 != c2) return 0;
}
! return 1;
}
int strcasecmp (const char *str1, const char *str2) {
! if (strlen(str1) != strlen(str2)) return 0;
return strncasecmp(str1,str2,strlen(str1));
}
|
|
From: Andreas R. <and...@us...> - 2002-05-05 01:54:20
|
Update of /cvsroot/squeak/squeak/platforms/win32 In directory usw-pr-cvs1:/tmp/cvs-serv32663 Modified Files: Makefile.mingw32 Log Message: updated for mp3 plugin Index: Makefile.mingw32 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/Makefile.mingw32,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.mingw32 5 May 2002 00:05:50 -0000 1.1 --- Makefile.mingw32 5 May 2002 01:54:17 -0000 1.2 *************** *** 165,179 **** DLL: $(DLLOBJ) - assureReleaseDir: - -$(MD) release - - #%.dll: assureReleaseDir - # -$(MD) Release\\$* - # $(MAKE) -C ../$* -f ../win32/Makefile.mingw32 DLLDIR=$* DLLNAME=$*.dll DLL XDEFS=-DSTANDALONE - # $(DLLTOOL) --output-def $(OUTDIR)/$*/$*.def --output-exp $(OUTDIR)/$*/$*.exp --output-lib $(OUTDIR)/$*/$*.lib $(OUTDIR)/$*/*.o - # $(DLLWRAP) -mwindows -def $(OUTDIR)/$*/$*.def -o $(OUTDIR)/$*.dll $(LIBS) $(OUTDIR)/$*/*.o $(OUTDIR)/$*/$*.exp - # strip --strip-all $(OUTDIR)/$*.dll - - makelib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) --- 165,168 ---- *************** *** 195,198 **** --- 184,197 ---- $(RM) $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def + Mpeg3Plugin.lib: + @$(MAKE) -Cplugins/Mpeg3Plugin -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib + $(CP) plugins\Mpeg3Plugin\Mpeg3Plugin.lib release\Mpeg3Plugin.lib + $(RM) plugins\Mpeg3Plugin\Mpeg3Plugin.lib + + Mpeg3Plugin.dll: + @$(MAKE) -Cplugins/Mpeg3Plugin -f Makefile.win32 makedll + $(CP) plugins\Mpeg3Plugin\Mpeg3Plugin.dll release\Mpeg3Plugin.dll + $(RM) plugins\Mpeg3Plugin\Mpeg3Plugin.dll + %.lib: @$(MAKE) -C plugins/$* -f ../../Makefile.mingw32 SRCDIR=../../ LIB=$*.lib OBJDIR=. XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib *************** *** 258,318 **** Squeak.res: misc/Squeak.rc $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ - - ### housekeeping - clean: - @echo ------------------------------------------------------ - @echo Please delete all files from the "$(OUTDIR)" directory - @echo ------------------------------------------------------ - - - ############################################################################# - # Generic Win32 support file definitions - # - #WINDIR= $(SRCDIR)/win32 - #WINSRC= $(notdir $(wildcard $(WINDIR)/sqWin32*.c)) - #WINOBJ= $(WINSRC:.c=.o) - - ############################################################################# - # Specific Win32 support file definitions - # - #WIN95DIR= $(WINDIR)/Win95 - #WIN95SRC= $(notdir $(wildcard $(WIN95DIR)/sqWin32*.c)) - #WIN95OBJ= $(WIN95SRC:.c=.o) - - ############################################################################# - # The Squeak plugin - # - #NPDIR= $(WINDIR)/NPSqueak - #NPSRC= $(notdir $(wildcard $(NPDIR)/*.c)) - #NPOBJ:= $(NPSRC:.c=.o) NPRes.o - #NPINC = $(NPDIR)/include - ############################################################################# - # CCG definitions - # - # Note: CCGINCDIR is a phony entry since CCG makes includes based on - # include <ccg/asm-i386.h> so we have to make it find that. - # - #CCGDIR = $(SRCDIR)/../ccg - #CCGINCDIR = $(CCGDIR)/.. - #CCG= $(WINDIR)/utils/ccg.exe - ############################################################################# - # The Squeak plugin - # - #NPSqueak.dll: assureReleaseDir - # $(MD) Release\\NPSqueak - # $(MAKE) -f Makefile.mingw32 DLLDIR=NPSqueak $(NPOBJ) - # $(DLLWRAP) -mwindows -def NPSqueak/NPSqueak.def -o $(OUTDIR)/NPSqueak.dll $(STDLIBS) $(OUTDIR)/NPSqueak/*.o - # strip --strip-all $(OUTDIR)/NPSqueak.dll - # - #NPRes.o: NPSqueak.rc - # $(RC) $(RCFLAGS) -i $< -o $(OUTDIR)/$@ - # - #NPSqueakLand.dll: - # $(MD) Release\\NPSqueak - # $(MAKE) -f Makefile.mingw32 DLLDIR=NPSqueak $(NPOBJ) XDEFS=-DSQUEAKLAND - # $(DLLWRAP) -mwindows -def NPSqueak/NPSqueak.def -o $(OUTDIR)/NPSqueakLand.dll $(LIBS) $(OUTDIR)/NPSqueak/*.o - # strip --strip-all $(OUTDIR)/NPSqueakLand.dll - - - --- 257,259 ---- |
|
From: Andreas R. <and...@us...> - 2002-05-05 01:53:13
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/Mpeg3Plugin In directory usw-pr-cvs1:/tmp/cvs-serv32558a Added Files: Makefile.win32 Log Message: added mp3 makefile --- NEW FILE: Makefile.win32 --- CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -DX86 CC = gcc RM = del DLLTOOL = dlltool DLLWRAP = dllwrap CFLAGS += -DNOPTHREADS CFLAGS += $(INCS) CFLAGS += $(XDEFS) MP3DIR= libmpeg MP3SRC= $(notdir $(wildcard $(MP3DIR)/*.c)) MP3SRC:= $(filter-out dump.c dump2.c mpeg3toc.c mpeg3cat.c testaudio.c udump.c test.c, $(MP3SRC)) MP3OBJ:= $(MP3SRC:.c=.o) AUDDIR= $(MP3DIR)/audio AUDSRC= $(notdir $(wildcard $(AUDDIR)/*.c)) AUDOBJ:= $(AUDSRC:.c=.o) VIDDIR= $(MP3DIR)/video VIDSRC= $(notdir $(wildcard $(VIDDIR)/*.c)) VIDSRC:= $(filter-out worksheet.c, $(VIDSRC)) VIDOBJ:= $(VIDSRC:.c=.o) PLGDIR= . PLGSRC= $(notdir $(wildcard $(PLGDIR)/*.c)) PLGOBJ:= $(PLGSRC:.c=.o) VPATH= $(PLGDIR) $(MP3DIR) $(VIDDIR) $(AUDDIR) INCS= -I$(MP3DIR) -I$(VIDDIR) -I$(AUDDIR) -I../../vm LIB = Mpeg3Plugin LIBOBJ= $(PLGOBJ) $(MP3OBJ) $(AUDOBJ) $(VIDOBJ) OBJDIR= . makelib: $(LIBOBJ) -$(RM) $(LIB) ar rc $(LIB).lib $(LIBOBJ) $(RM) $(LIBOBJ) makedll: $(LIBOBJ) $(DLLTOOL) \ --output-def $(OBJDIR)/$(LIB).def \ --output-exp $(OBJDIR)/$(LIB).exp \ --output-lib $(OBJDIR)/$(LIB).lib \ $(LIBOBJ) $(DLLWRAP) -mwindows \ -def $(OBJDIR)/$(LIB).def \ -o $(OBJDIR)/$(LIB).dll \ $(LIBS) \ $(OBJDIR)/$(LIB).exp \ $(LIBOBJ) strip --strip-all $(OBJDIR)/$(LIB).dll $(RM) $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def .c.o: $(CC) -c $(CFLAGS) $< |
|
From: Joern E. <je...@us...> - 2002-05-05 01:42:16
|
Update of /cvsroot/squeak/squeak/platforms/unix/misc/util
In directory usw-pr-cvs1:/tmp/cvs-serv30060
Modified Files:
mkMake
Log Message:
* changed macro assignments from ":=" to "=", "A := $(A) ..." to "A += ..:"
so it also works with Solaris make
* lame emulation of GNU find's "-maxdepth" option because Solaris comes
with a find that doesn't know this option
Index: mkMake
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/misc/util/mkMake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mkMake 7 Mar 2002 06:24:48 -0000 1.7
--- mkMake 5 May 2002 01:42:13 -0000 1.8
***************
*** 121,125 ****
# $1, $2, etc. directories to find header files
pruneOverridenHeaders() {
! basenames=`find "$@" -maxdepth 1 '(' -name '*.h' -o -name 'platform.exports' ')' -exec basename '{}' ';' | sort | uniq`
echo basenames: $basenames
for header in $basenames
--- 121,140 ----
# $1, $2, etc. directories to find header files
pruneOverridenHeaders() {
! #######################
! # basenames=`find "$@" -maxdepth 1 '(' -name '*.h' -o -name 'platform.exports' ')' -exec basename '{}' ';' | sort | uniq`
! #######################
! basenames=""
! for dir in "$@"
! do
! newnames=`ls "$dir"/*.h "$dir/platform.exports" 2>/dev/null`
! if [ "$newnames" ]
! then
! basenames="$newnames
! $basenames"
! fi
! done
! basenames=`echo "$basenames" | xargs -n 1 basename`
! basenames=`echo "$basenames" | sort | uniq`
! #######################
echo basenames: $basenames
for header in $basenames
***************
*** 210,214 ****
done
! echo "PLUGINS_O:=\$(PLUGINS_O) $PLUGINS_O"
echo ""
--- 225,229 ----
done
! echo "PLUGINS_O += $PLUGINS_O"
echo ""
***************
*** 288,290 ****
### inform any reader that the automatic part is over
! echo '### end of part generated by mkMake'
\ No newline at end of file
--- 303,305 ----
### inform any reader that the automatic part is over
! echo '### end of part generated by mkMake'
|
|
From: Joern E. <je...@us...> - 2002-05-05 01:40:23
|
Update of /cvsroot/squeak/squeak/platforms/unix/misc
In directory usw-pr-cvs1:/tmp/cvs-serv29849
Modified Files:
configure
Log Message:
regenerated after changes in configure.ac and acinclude.a4
Index: configure
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/misc/configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure 4 Mar 2002 22:55:36 -0000 1.14
--- configure 5 May 2002 01:40:18 -0000 1.15
***************
*** 1,7 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.52 for squeak 3.2-4743.
#
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
--- 1,7 ----
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
[...11658 lines suppressed...]
{ (exit 0); exit 0; }
! EOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
# configure is writing to config.log, and then calls config.status.
--- 12098,12110 ----
fi
done
! _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
! _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+
# configure is writing to config.log, and then calls config.status.
|
|
From: Joern E. <je...@us...> - 2002-05-05 01:39:02
|
Update of /cvsroot/squeak/squeak/platforms/unix/misc In directory usw-pr-cvs1:/tmp/cvs-serv29610 Modified Files: configure.ac Log Message: some shell "tr"s don't understand "[a-z]" ranges, but "[:lower:]" character classes Index: configure.ac =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/misc/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.ac 4 Mar 2002 02:33:47 -0000 1.9 --- configure.ac 5 May 2002 01:38:59 -0000 1.10 *************** *** 182,186 **** ! AUDIO_CDEFINE=`echo USE_AUDIO_$with_audio | tr '[a-z]' '[A-Z]'` AC_DEFINE_UNQUOTED($AUDIO_CDEFINE) --- 182,186 ---- ! AUDIO_CDEFINE=`echo USE_AUDIO_$with_audio | tr '[[:lower:]]' '[[:upper:]]'` AC_DEFINE_UNQUOTED($AUDIO_CDEFINE) |
|
From: Joern E. <je...@us...> - 2002-05-05 01:37:04
|
Update of /cvsroot/squeak/squeak/platforms/unix/misc
In directory usw-pr-cvs1:/tmp/cvs-serv29400a
Modified Files:
acinclude.m4
Log Message:
some shell "test"s don't know "-e", so do "test -c /dev/dsp" instead
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/misc/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acinclude.m4 4 Mar 2002 22:54:50 -0000 1.4
--- acinclude.m4 5 May 2002 01:37:00 -0000 1.5
***************
*** 144,148 ****
AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;],
ac_cv_oss="yes", ac_cv_oss="no"))
! if test "$ac_cv_oss" = "yes" -a -e /dev/dsp; then
AC_DEFINE(HAVE_OSS,1)
fi])
--- 144,148 ----
AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;],
ac_cv_oss="yes", ac_cv_oss="no"))
! if test "$ac_cv_oss" = "yes" -a -c /dev/dsp; then
AC_DEFINE(HAVE_OSS,1)
fi])
|