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: John M M. <jo...@us...> - 2004-08-03 02:40:16
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27227/squeak/platforms/Mac OS/vm Modified Files: sqMacFileLogic.c Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: sqMacFileLogic.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacFileLogic.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sqMacFileLogic.c 23 Apr 2004 20:46:12 -0000 1.13 --- sqMacFileLogic.c 3 Aug 2004 02:40:08 -0000 1.14 *************** *** 506,509 **** --- 506,510 ---- short pathLength; Handle fullPathHandle; + #pragma unused(encoding) error = FSpGetFullPath(where, &pathLength, &fullPathHandle); *************** *** 840,845 **** OSErr FSMakeFSSpecCompat(short vRefNum, long dirID, ConstStr255Param fileName, FSSpec *spec) { OSErr result; char pascalString[256]; ! /* Let the file system create the FSSpec if it can since it does the job */ /* much more efficiently than I can. */ --- 841,847 ---- OSErr FSMakeFSSpecCompat(short vRefNum, long dirID, ConstStr255Param fileName, FSSpec *spec) { OSErr result; + #if TARGET_API_MAC_CARBON char pascalString[256]; ! #endif /* Let the file system create the FSSpec if it can since it does the job */ /* much more efficiently than I can. */ *************** *** 875,879 **** ProcessSerialNumber PSN; ProcessInfoRec pinfo; - FSSpec checkDirectory; OSErr err; --- 877,880 ---- *************** *** 890,893 **** --- 891,895 ---- FSMakeFSSpecCompat(workingDirectory->vRefNum, workingDirectory->parID,"\p:::",workingDirectory); #else + FSSpec checkDirectory; FSMakeFSSpecCompat(workingDirectory->vRefNum, workingDirectory->parID,"\p:",&checkDirectory); if (strncmp((const char *)checkDirectory.name,(const char *) "\pMacOSClassic",13) == 0) *************** *** 1029,1032 **** --- 1031,1035 ---- NavCallBackUserData callBackUD) { + #pragma unused(callBackUD) // WindowPtr window = // (WindowPtr)callBackParms->eventData.event->message; *************** *** 1050,1053 **** --- 1053,1057 ---- NavFilterModes filterMode) { + #pragma unused(filterMode,callBackUD) NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*)info; |
|
From: John M M. <jo...@us...> - 2004-08-03 02:40:07
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27137/squeak/platforms/Mac OS/vm Modified Files: sqMacExternalPrims.c Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: sqMacExternalPrims.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacExternalPrims.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sqMacExternalPrims.c 2 Dec 2003 04:52:11 -0000 1.6 --- sqMacExternalPrims.c 3 Aug 2004 02:39:59 -0000 1.7 *************** *** 33,40 **** char pluginDirPath[1000]; CFragConnectionID libHandle; Ptr mainAddr; Str255 errorMsg,tempPluginName; OSErr err; ! /* first, look in the "<Squeak VM directory>Plugins" directory for the library */ getVMPathWithEncoding(pluginDirPath,gCurrentVMEncoding); --- 33,43 ---- char pluginDirPath[1000]; CFragConnectionID libHandle; + #ifndef BROWSERPLUGIN + #if !defined ( __APPLE__ ) && !defined ( __MACH__ ) Ptr mainAddr; Str255 errorMsg,tempPluginName; OSErr err; ! #endif ! #endif /* first, look in the "<Squeak VM directory>Plugins" directory for the library */ getVMPathWithEncoding(pluginDirPath,gCurrentVMEncoding); *************** *** 174,178 **** int ioFindExternalFunctionIn(char *lookupName, int moduleHandle) { void * functionPtr = 0; - OSErr err; CFStringRef theString; --- 177,180 ---- |
|
From: John M M. <jo...@us...> - 2004-08-03 02:39:58
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27096/squeak/platforms/Mac OS/vm Modified Files: sqMacEncoding.c Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: sqMacEncoding.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacEncoding.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sqMacEncoding.c 23 Apr 2004 20:45:53 -0000 1.2 --- sqMacEncoding.c 3 Aug 2004 02:39:50 -0000 1.3 *************** *** 78,82 **** void SetImageNameViaString(char *string,UInt32 encoding) { - char *ignore; if (imageNameString != NULL) CFRelease(imageNameString); --- 78,81 ---- *************** *** 139,142 **** --- 138,142 ---- void getVMPathWithEncoding(char *target,UInt32 encoding) { + #pragma unused(encoding) strcpy(target,vmPathString); } *************** *** 151,154 **** --- 151,155 ---- void getImageNameWithEncoding(char *target,UInt32 encoding) { + #pragma unused(encoding) strcpy(target,imageName); } *************** *** 159,162 **** --- 160,164 ---- void SetImageNameViaString(char *string,UInt32 encoding) { + #pragma unused(encoding) strcpy(imageName,string); } *************** *** 171,186 **** --- 173,192 ---- void getDocumentNameWithEncoding(char *target,UInt32 encoding) { + #pragma unused(encoding) strcpy(target,documentNameString); } void SetDocumentNameViaString(char *string,UInt32 encoding) { + #pragma unused(encoding) strcpy(documentNameString,string); } void getShortImageNameWithEncoding(char *target,UInt32 encoding) { + #pragma unused(encoding) strcpy(target,shortImageNameString); } void SetShortImageNameViaString(char *string,UInt32 encoding) { + #pragma unused(encoding) strcpy(shortImageNameString,string); } |
|
From: John M M. <jo...@us...> - 2004-08-03 02:39:52
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/DropPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27079/squeak/platforms/Mac OS/plugins/DropPlugin Modified Files: sqMacDragDrop.c Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: sqMacDragDrop.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/DropPlugin/sqMacDragDrop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sqMacDragDrop.c 2 Dec 2003 04:52:07 -0000 1.6 --- sqMacDragDrop.c 3 Aug 2004 02:39:43 -0000 1.7 *************** *** 175,181 **** --- 175,184 ---- gMainReceiveHandler = NULL; gDragDropThrottleSpinLock = false; + return 1; } int sqSecFileAccessCallback(void *function) { + #pragma unused(function) + return 0; } *************** *** 278,281 **** --- 281,285 ---- pascal OSErr MyDragTrackingHandler(DragTrackingMessage message, WindowPtr theWindow, void *refCon, DragReference theDragRef) { + #pragma unused(refCon) /* we're drawing into the image well if we hilite... */ Rect bounds; *************** *** 352,355 **** --- 356,361 ---- pascal OSErr MyDragReceiveHandler(WindowPtr theWindow, void *refcon, DragReference theDragRef) { + #pragma unused(refcon) + #pragma unused(theWindow) ItemReference theItem; PromiseHFSFlavor targetPromise; |
|
From: John M M. <jo...@us...> - 2004-08-03 02:39:43
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/FilePlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27064/squeak/platforms/Mac OS/plugins/FilePlugin Modified Files: sqMacDirectory.c Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: sqMacDirectory.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/FilePlugin/sqMacDirectory.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** sqMacDirectory.c 23 Apr 2004 20:45:30 -0000 1.10 --- sqMacDirectory.c 3 Aug 2004 02:39:35 -0000 1.11 *************** *** 87,91 **** char cFileName[1001]; - int err; if (pathStringLength >= 1000) { --- 87,90 ---- *************** *** 103,106 **** --- 102,106 ---- UniChar buffer[1024]; long tokenLength; + int err; filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),gCurrentVMEncoding,false); *************** *** 137,141 **** /* Delete the existing directory with the given path. */ char cFileName[1000]; - int err; if (pathStringLength >= 1000) { --- 137,140 ---- *************** *** 215,219 **** HFSUniStr255 uniStr; FSVolumeInfo volumeInfo; - FSRef fsRef; /* default return values */ --- 214,217 ---- *************** *** 286,290 **** if (gCurrentVMEncoding == kCFStringEncodingUTF8) CFStringNormalize(mStr, kCFStringNormalizationFormKC); // pre-combined - CFIndex len = CFStringGetLength(mStr); CFStringGetCString(mStr, name, 256, gCurrentVMEncoding); CFRelease(mStr); --- 284,287 ---- *************** *** 381,385 **** } ! dir_SetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) { /* Set the Macintosh type and creator of the given file. */ /* Note: On other platforms, this is just a noop. */ --- 378,382 ---- } ! int dir_SetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) { /* Set the Macintosh type and creator of the given file. */ /* Note: On other platforms, this is just a noop. */ *************** *** 397,401 **** } ! dir_GetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) { /* Get the Macintosh type and creator of the given file. */ /* Note: On other platforms, this is just a noop. */ --- 394,398 ---- } ! int dir_GetMacFileTypeAndCreator(char *filename, int filenameSize, char *fType, char *fCreator) { /* Get the Macintosh type and creator of the given file. */ /* Note: On other platforms, this is just a noop. */ *************** *** 442,446 **** lastPathValid = false; lastSpec = *spec; ! return; } strncpy(lastPath,pathString,pathStringLength); --- 439,443 ---- lastPathValid = false; lastSpec = *spec; ! return 0; } strncpy(lastPath,pathString,pathStringLength); *************** *** 448,451 **** --- 445,449 ---- lastPathValid = true; lastSpec = *spec; + return 0; } |
|
From: John M M. <jo...@us...> - 2004-08-03 02:39:35
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/AsynchFilePlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27044/squeak/platforms/Mac OS/plugins/AsynchFilePlugin Modified Files: sqMacAsyncFilePrims.c Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: sqMacAsyncFilePrims.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/AsynchFilePlugin/sqMacAsyncFilePrims.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sqMacAsyncFilePrims.c 18 Dec 2001 21:08:17 -0000 1.2 --- sqMacAsyncFilePrims.c 3 Aug 2004 02:39:27 -0000 1.3 *************** *** 180,184 **** OSErr err; ! if (!asyncFileValid(f)) return; /* already closed */ state = f->state; --- 180,184 ---- OSErr err; ! if (!asyncFileValid(f)) return 0; /* already closed */ state = f->state; *************** *** 200,203 **** --- 200,204 ---- f->state = nil; f->sessionID = 0; + return 0; } *************** *** 265,268 **** --- 266,270 ---- state->bufferSize = 0; state->bufferPtr = nil; + return 0; } *************** *** 313,318 **** state->status = IDLE; success(false); ! return; } } --- 315,321 ---- state->status = IDLE; success(false); ! return 0; } + return 0; } *************** *** 363,365 **** --- 366,369 ---- return success(false); } + return 0; } |
|
From: John M M. <jo...@us...> - 2004-08-03 02:39:27
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27028/squeak/platforms/Mac OS/vm/Developer Modified Files: myMacHeaders.pch Log Message: 3.7.4b3 Compiler warning reduction process. Return 0 if required, flag or removed unused variables, fix ambigous warning messages Index: myMacHeaders.pch =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/myMacHeaders.pch,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** myMacHeaders.pch 20 Jun 2003 01:57:13 -0000 1.2 --- myMacHeaders.pch 3 Aug 2004 02:39:18 -0000 1.3 *************** *** 41,43 **** --- 41,44 ---- #define ACCESSOR_CALLS_ARE_FUNCTIONS 1 #define SQUEAK_BUILTIN_PLUGIN + //#define BROWSERPLUGIN #include "myMacHeaders.c" |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:24:01
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5843/misc Added Files: Tag: ned-branch build.gcc33.bat Log Message: Initial GCC 3.3 work --- NEW FILE: build.gcc33.bat --- make -f %PWD%/Makefile -C release SRCDIR=%PWD% %@% |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:21:44
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/vm Modified Files: Tag: ned-branch sqGnu.h sqPlatformSpecific.h sqWin32.h sqWin32DirectInput.c sqWin32GUID.c Log Message: Initial GCC 3.3 changes Index: sqGnu.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqGnu.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** sqGnu.h 11 May 2002 17:09:03 -0000 1.2 --- sqGnu.h 16 Jul 2004 18:21:35 -0000 1.2.2.1 *************** *** 176,236 **** #define PROFILE_BYTECODE(x) __asm__("movl %0, _bcProfileCurrent" : : "i" (x)) ! #define PROFILE_BYTECODE_END __asm__(" ! cmpl $0, _profilerActive;\ ! je 0f;\ ! pushl %ebx;\ ! pushl %edx;\ ! movl _bcProfileCurrent, %ebx;\ ! pushl %eax; \ ! rdtsc; \ ! subl _bcProfileLow, %eax; \ ! sbbl _bcProfileHigh, %edx; \ ! incl _bcProfileCountTable(, %ebx, 4);\ ! leal _bcProfileTable(, %%ebx, 8), %ebx;\ ! addl %eax, 0(%ebx);\ ! adcl %edx, 4(%ebx);\ ! addl %eax, _bcProfileLow; \ ! adcl %edx, _bcProfileHigh; \ ! popl %eax;\ ! popl %edx;\ ! popl %ebx;\ ! 0:\ ! "); ! #define PROFILE_PRIMITIVE(x) __asm__("\ ! cmpl $0, _profilerActive;\ ! je 0f;\ ! pushl %%edx;\ ! pushl %%eax;\ ! rdtsc;\ ! movl %0, _primProfileCurrent;\ ! movl %%eax, _primProfileLow;\ ! movl %%edx, _primProfileHigh;\ ! popl %%eax;\ ! popl %%edx;\ ! 0:\ ! " : /* no return */ : "i" (x)); ! #define PROFILE_PRIMITIVE_END __asm__("\ ! cmpl $0, _profilerActive;\ ! je 0f;\ ! pushl %ebx;\ ! pushl %eax;\ ! pushl %edx;\ ! movl _primProfileCurrent, %ebx;\ ! rdtsc;\ ! subl _primProfileLow, %eax;\ ! sbbl _primProfileHigh, %edx;\ ! incl _primProfileCountTable(, %ebx, 4);\ ! leal _primProfileTable(, %ebx, 8), %ebx;\ ! addl %eax, 0(%ebx);\ ! adcl %edx, 4(%ebx);\ ! subl %eax, _bcProfileLow;\ ! sbbl %edx, _bcProfileHigh;\ ! popl %edx;\ ! popl %eax;\ ! popl %ebx;\ ! 0:\ ! "); #endif --- 176,236 ---- #define PROFILE_BYTECODE(x) __asm__("movl %0, _bcProfileCurrent" : : "i" (x)) ! #define PROFILE_BYTECODE_END __asm__( \ ! " cmpl $0, _profilerActive;\n" \ ! " je 0f;\n" \ ! " pushl %ebx;\n" \ ! " pushl %edx;\n" \ ! " movl _bcProfileCurrent, %ebx;\n" \ ! " pushl %eax;\n" \ ! " rdtsc;\n" \ ! " subl _bcProfileLow, %eax;\n" \ ! " sbbl _bcProfileHigh, %edx;\n" \ ! " incl _bcProfileCountTable(, %ebx, 4);\n" \ ! " leal _bcProfileTable(, %%ebx, 8), %ebx;\n" \ ! " addl %eax, 0(%ebx);\n" \ ! " adcl %edx, 4(%ebx);\n" \ ! " addl %eax, _bcProfileLow;\n" \ ! " adcl %edx, _bcProfileHigh;\n" \ ! " popl %eax;\n" \ ! " popl %edx;\n" \ ! " popl %ebx;\n" \ ! " 0:\n" \ ! ); ! #define PROFILE_PRIMITIVE(x) __asm__(\ ! " cmpl $0, _profilerActive;\n" \ ! " je 0f;\n" \ ! " pushl %%edx;\n" \ ! " pushl %%eax;\n" \ ! " rdtsc;\n" \ ! " movl %0, _primProfileCurrent;\n" \ ! " movl %%eax, _primProfileLow;\n" \ ! " movl %%edx, _primProfileHigh;\n" \ ! " popl %%eax;\n" \ ! " popl %%edx;\n" \ ! " 0:\n" \ ! : /* no return */ : "i" (x)); ! #define PROFILE_PRIMITIVE_END __asm__( \ ! " cmpl $0, _profilerActive;\n" \ ! " je 0f;\n" \ ! " pushl %ebx;\n" \ ! " pushl %eax;\n" \ ! " pushl %edx;\n" \ ! " movl _primProfileCurrent, %ebx;\n" \ ! " rdtsc;\n" \ ! " subl _primProfileLow, %eax;\n" \ ! " sbbl _primProfileHigh, %edx;\n" \ ! " incl _primProfileCountTable(, %ebx, 4);\n" \ ! " leal _primProfileTable(, %ebx, 8), %ebx;\n" \ ! " addl %eax, 0(%ebx);\n" \ ! " adcl %edx, 4(%ebx);\n" \ ! " subl %eax, _bcProfileLow;\n" \ ! " sbbl %edx, _bcProfileHigh;\n" \ ! " popl %edx;\n" \ ! " popl %eax;\n" \ ! " popl %ebx;\n" \ ! " 0:\n" \ ! ); #endif Index: sqPlatformSpecific.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqPlatformSpecific.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** sqPlatformSpecific.h 2 Nov 2003 19:52:40 -0000 1.9 --- sqPlatformSpecific.h 16 Jul 2004 18:21:35 -0000 1.9.2.1 *************** *** 62,66 **** extern int _lowResMSecs; #define ioLowResMSecs() _lowResMSecs ! #else error! #endif /* WIN32 */ --- 62,67 ---- extern int _lowResMSecs; #define ioLowResMSecs() _lowResMSecs ! #else ! #error "WIN32 not defined" #endif /* WIN32 */ Index: sqWin32.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32.h,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** sqWin32.h 12 Nov 2003 22:38:21 -0000 1.14 --- sqWin32.h 16 Jul 2004 18:21:35 -0000 1.14.2.1 *************** *** 174,191 **** /* Several setup functions */ /********************************************************/ ! void SetupFilesAndPath(); ! void SetupKeymap(); ! void SetupWindows(); ! void SetupPixmaps(); ! void SetupPrinter(); ! void SetupTimer(); ! void SetupPreferences(); ! void SetupMIDI(); /********************************************************/ /* Startup helper functions */ /********************************************************/ ! int findImageFile(); ! int openImageFile(); /********************************************************/ --- 174,191 ---- /* Several setup functions */ /********************************************************/ ! void SetupFilesAndPath(void); ! void SetupKeymap(void); ! void SetupWindows(void); ! void SetupPixmaps(void); ! void SetupPrinter(void); ! void SetupTimer(void); ! void SetupPreferences(void); ! void SetupMIDI(void); /********************************************************/ /* Startup helper functions */ /********************************************************/ ! int findImageFile(void); ! int openImageFile(void); /********************************************************/ *************** *** 203,208 **** /* Misc functions */ /********************************************************/ ! void SetWindowSize(); ! void ReleaseTimer(); int printUsage(int level); --- 203,208 ---- /* Misc functions */ /********************************************************/ ! void SetWindowSize(void); ! void ReleaseTimer(void); int printUsage(int level); *************** *** 213,219 **** /* The external startup point for installing squeak as NT service */ void sqServiceInstall(void); ! /* The main() function used by NT services */ int sqServiceMain(void); ! /* The generic main() function for starting squeak */ int sqMain(char *lpCmdLine, int nCmdShow); #endif --- 213,219 ---- /* The external startup point for installing squeak as NT service */ void sqServiceInstall(void); ! /* The main(void) function used by NT services */ int sqServiceMain(void); ! /* The generic main(void) function for starting squeak */ int sqMain(char *lpCmdLine, int nCmdShow); #endif *************** *** 417,420 **** --- 417,421 ---- #endif + /******************************************************/ /* Profiling support */ Index: sqWin32DirectInput.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32DirectInput.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** sqWin32DirectInput.c 12 Nov 2003 22:36:55 -0000 1.3 --- sqWin32DirectInput.c 16 Jul 2004 18:21:35 -0000 1.3.2.1 *************** *** 25,35 **** #define DIRECTINPUT_VERSION 0x700 /* restrict to DX7 */ #include <windows.h> #include <ole2.h> #include "sq.h" - #ifdef __MINGW32__ - #define HMONITOR_DECLARED - #undef WINNT - #endif #include <dinput.h> --- 25,32 ---- #define DIRECTINPUT_VERSION 0x700 /* restrict to DX7 */ + #include <windows.h> #include <ole2.h> #include "sq.h" #include <dinput.h> Index: sqWin32GUID.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32GUID.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** sqWin32GUID.c 8 Apr 2003 21:00:36 -0000 1.2 --- sqWin32GUID.c 16 Jul 2004 18:21:35 -0000 1.2.2.1 *************** *** 3,11 **** #include <windows.h> #ifdef __MINGW32__ ! #define HMONITOR_DECLARED ! #undef WINNT #endif #include <ddraw.h> #include <dsound.h> --- 3,16 ---- #include <windows.h> + #if 0 #ifdef __MINGW32__ ! #if !defined HMONITOR_DECLARED ! # define HMONITOR_DECLARED 1 ! #endif ! # undef WINNT ! #endif #endif + #if 0 #include <ddraw.h> #include <dsound.h> *************** *** 13,15 **** #include <dinput.h> ! --- 18,20 ---- #include <dinput.h> ! #endif |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:21:44
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/SoundPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/plugins/SoundPlugin Modified Files: Tag: ned-branch sqWin32Sound.c Log Message: Initial GCC 3.3 changes Index: sqWin32Sound.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/SoundPlugin/sqWin32Sound.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** sqWin32Sound.c 2 Nov 2003 19:52:40 -0000 1.5 --- sqWin32Sound.c 16 Jul 2004 18:21:35 -0000 1.5.2.1 *************** *** 40,46 **** #undef WINNT #define DIRECTSOUND_VERSION 0x0600 /* use DirectSound 6.0 */ - #ifdef __MINGW32__ - #define HMONITOR_DECLARED - #endif #include <dsound.h> --- 40,43 ---- |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:21:44
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/plugins/SocketPlugin Modified Files: Tag: ned-branch sqWin32NewNet.c Log Message: Initial GCC 3.3 changes Index: sqWin32NewNet.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** sqWin32NewNet.c 19 Jan 2004 22:25:51 -0000 1.9 --- sqWin32NewNet.c 16 Jul 2004 18:21:34 -0000 1.9.2.1 *************** *** 30,35 **** #endif - #if 0 - #ifdef __MINGW32__ /* --- 30,33 ---- *************** *** 66,85 **** #define SIO_ADDRESS_LIST_SORT _WSAIORW(IOC_WS2,25) - - int - FAR PASCAL - WSAIoctl( - SOCKET s, - DWORD dwIoControlCode, - LPVOID lpvInBuffer, - DWORD cbInBuffer, - LPVOID lpvOutBuffer, - DWORD cbOutBuffer, - LPDWORD lpcbBytesReturned, - LPOVERLAPPED lpOverlapped, - void *lpCompletionRoutine - ); - #endif - #endif --- 64,67 ---- *************** *** 1540,1558 **** { "SO_OOBINLINE", SOL_SOCKET, SO_OOBINLINE, 1 }, { "SO_LINGER", SOL_SOCKET, SO_LINGER, 1 }, { "IP_MULTICAST_IF", SOL_IP, IP_MULTICAST_IF, 1 }, { "IP_MULTICAST_TTL", SOL_IP, IP_MULTICAST_TTL, 1 }, { "IP_MULTICAST_LOOP", SOL_IP, IP_MULTICAST_LOOP, 1 }, { "TCP_NODELAY", SOL_TCP, TCP_NODELAY, 1 }, { "SO_RCVLOWAT", SOL_SOCKET, SO_RCVLOWAT, 1 }, { "SO_SNDLOWAT", SOL_SOCKET, SO_SNDLOWAT, 1 }, /* multicast support */ {"IP_ADD_MEMBERSHIP", SOL_IP, IP_ADD_MEMBERSHIP, 100}, {"IP_DROP_MEMBERSHIP", SOL_IP, IP_DROP_MEMBERSHIP, 100}, - #if 0 /* WSAIoctl() support */ {"SIO_GET_BROADCAST_ADDRESS", 0, SIO_GET_BROADCAST_ADDRESS, 200}, - #endif { (char *)0, 0, 0, 0 } }; --- 1522,1542 ---- { "SO_OOBINLINE", SOL_SOCKET, SO_OOBINLINE, 1 }, { "SO_LINGER", SOL_SOCKET, SO_LINGER, 1 }, + #ifndef _WINSOCK2_H { "IP_MULTICAST_IF", SOL_IP, IP_MULTICAST_IF, 1 }, { "IP_MULTICAST_TTL", SOL_IP, IP_MULTICAST_TTL, 1 }, { "IP_MULTICAST_LOOP", SOL_IP, IP_MULTICAST_LOOP, 1 }, + #endif { "TCP_NODELAY", SOL_TCP, TCP_NODELAY, 1 }, { "SO_RCVLOWAT", SOL_SOCKET, SO_RCVLOWAT, 1 }, { "SO_SNDLOWAT", SOL_SOCKET, SO_SNDLOWAT, 1 }, + #ifndef _WINSOCK2_H /* multicast support */ {"IP_ADD_MEMBERSHIP", SOL_IP, IP_ADD_MEMBERSHIP, 100}, {"IP_DROP_MEMBERSHIP", SOL_IP, IP_DROP_MEMBERSHIP, 100}, + #endif /* WSAIoctl() support */ {"SIO_GET_BROADCAST_ADDRESS", 0, SIO_GET_BROADCAST_ADDRESS, 200}, { (char *)0, 0, 0, 0 } }; |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:21:44
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/SqueakFFIPrims In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/plugins/SqueakFFIPrims Modified Files: Tag: ned-branch sqWin32FFI.c Log Message: Initial GCC 3.3 changes Index: sqWin32FFI.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** sqWin32FFI.c 1 Jun 2002 11:44:39 -0000 1.2 --- sqWin32FFI.c 16 Jul 2004 18:21:35 -0000 1.2.2.1 *************** *** 322,364 **** #endif #ifdef __GNUC__ ! asm(" ! movl %%ebp, _oldBP ! movl %%esp, _oldSP ! pushl %%ebx; ! pushl %%ecx; ! pushl %%edx; ! pushl %%edi; ! pushl %%esi; ! pushl %%ebp; ! /* mark the frame */ ! movl %%esp, %%ebp ! /* alloca() ffiStackIndex size bytes */ ! movl _ffiArgIndex, %%ecx; ! shll $2, %%ecx; ! subl %%ecx, %%esp ! /* copy stack */ ! movl %%esp, %%edi; ! leal _ffiArgs, %%esi; ! shrl $2, %%ecx; ! cld; ! rep movsl; ! /* go calling */ ! call *%%ebx ! /* restore frame */ ! movl %%ebp, %%esp ! /* store the return values */ ! movl %%eax, _intReturnValue ! movl %%edx, _intReturnValue2 ! fstpl _floatReturnValue ! /* restore register values */ ! popl %%ebp ! popl %%esi ! popl %%edi ! popl %%edx ! popl %%ecx ! popl %%ebx ! movl %%ebp, _newBP ! movl %%esp, _newSP ! ": /* no outputs */ : "ebx" (fn) : "eax" /* clobbered registers */); /* done */ #endif --- 322,362 ---- #endif #ifdef __GNUC__ ! asm(" movl %%ebp, _oldBP\n" ! " movl %%esp, _oldSP\n" ! " pushl %%ebx;\n" ! " pushl %%ecx;\n" ! " pushl %%edx;\n" ! " pushl %%edi;\n" ! " pushl %%esi;\n" ! " pushl %%ebp;\n" ! " /* mark the frame */\n" ! " movl %%esp, %%ebp\n" ! " /* alloca() ffiStackIndex size bytes */\n" ! " movl _ffiArgIndex, %%ecx;\n" ! " shll $2, %%ecx;\n" ! " subl %%ecx, %%esp\n" ! " /* copy stack */\n" ! " movl %%esp, %%edi;\n" ! " leal _ffiArgs, %%esi;\n" ! " shrl $2, %%ecx;\n" ! " cld;\n" ! " rep movsl;\n" ! " /* go calling */\n" ! " call *%%ebx\n" ! " /* restore frame */\n" ! " movl %%ebp, %%esp\n" ! " /* store the return values */\n" ! " movl %%eax, _intReturnValue\n" ! " movl %%edx, _intReturnValue2\n" ! " fstpl _floatReturnValue\n" ! " /* restore register values */\n" ! " popl %%ebp\n" ! " popl %%esi\n" ! " popl %%edi\n" ! " popl %%edx\n" ! " popl %%ecx\n" ! " popl %%ebx\n" ! "movl %%ebp, _newBP\n" ! "movl %%esp, _newSP\n" : /* no outputs */ : "ebx" (fn) : "eax" /* clobbered registers */ ); /* done */ #endif |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:21:42
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/plugins/B3DAcceleratorPlugin Modified Files: Tag: ned-branch sqWin32D3D.c Log Message: Initial GCC 3.3 changes Index: sqWin32D3D.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** sqWin32D3D.c 5 Sep 2002 19:30:45 -0000 1.8 --- sqWin32D3D.c 16 Jul 2004 18:21:34 -0000 1.8.2.1 *************** *** 15,22 **** #include <windows.h> #include <ole2.h> - #ifdef __MINGW32__ - #define HMONITOR_DECLARED - #undef WINNT - #endif #include <ddraw.h> --- 15,18 ---- |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:18:22
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4569/misc Modified Files: Tag: ned-branch Squeak.rc Log Message: added newline Index: Squeak.rc =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Squeak.rc,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** Squeak.rc 24 Oct 2001 23:14:22 -0000 1.1.1.1 --- Squeak.rc 16 Jul 2004 18:18:09 -0000 1.1.1.1.2.1 *************** *** 1,5 **** ! #ifdef _WIN32 ! 1 ICON DISCARDABLE "squeak.ico" ! 2 ICON DISCARDABLE "squeak2.ico" ! 3 ICON DISCARDABLE "squeak3.ico" ! #endif \ No newline at end of file --- 1,5 ---- ! #ifdef _WIN32 ! 1 ICON DISCARDABLE "squeak.ico" ! 2 ICON DISCARDABLE "squeak2.ico" ! 3 ICON DISCARDABLE "squeak3.ico" ! #endif |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:16:20
|
Update of /cvsroot/squeak/squeak/platforms/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3994 Modified Files: Tag: ned-branch Makefile.mingw32 build.bat Log Message: GCC 3.3 initial mods |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:15:40
|
Update of /cvsroot/squeak/squeak/platforms/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3764 Modified Files: Tag: ned-branch Makefile.mingw32 build.bat Log Message: GCC 3.3 initial mods |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:14:39
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3485/vm Modified Files: Tag: ned-branch sqWin32Window.c Log Message: Initial GCC 3.3 mods Index: sqWin32Window.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Window.c,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** sqWin32Window.c 14 Aug 2003 21:31:55 -0000 1.15 --- sqWin32Window.c 16 Jul 2004 18:14:28 -0000 1.15.2.1 *************** *** 2136,2140 **** depth, width, &updateRect); PROFILE_END(ticksForReversal) ! #endif NO_BYTE_REVERSAL bmi->bmiHeader.biWidth = width; --- 2136,2140 ---- depth, width, &updateRect); PROFILE_END(ticksForReversal) ! #endif /* NO_BYTE_REVERSAL */ bmi->bmiHeader.biWidth = width; |
|
From: Ned K. <ne...@us...> - 2004-07-16 18:12:32
|
Update of /cvsroot/squeak/squeak/platforms/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3071 Modified Files: Tag: ned-branch Makefile.mingw32 build.bat Log Message: GCC 3.3 initial mods |
|
From: Ned K. <ne...@us...> - 2004-07-16 17:38:21
|
Update of /cvsroot/squeak/squeak/platforms/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28692 Added Files: Tag: ned-branch build.gcc33.bat Log Message: more gcc33 work --- NEW FILE: build.gcc33.bat --- make -f %PWD%/Makefile -C release SRCDIR=%PWD% %@% |
|
From: Ned K. <ne...@us...> - 2004-07-16 17:36:19
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28361/misc Modified Files: Tag: ned-branch Makefile.mingw.gcc33 Log Message: Index: Makefile.mingw.gcc33 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Attic/Makefile.mingw.gcc33,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile.mingw.gcc33 9 Jul 2004 01:28:53 -0000 1.1.2.1 --- Makefile.mingw.gcc33 16 Jul 2004 17:35:57 -0000 1.1.2.2 *************** *** 1,317 **** ! ############################################################################# ! # Makefile for Win32 Squeak using gcc-3.3.1 and MingW32 ! # Modified from Andreas Raab's ! # "Makefile for Win32 Squeak using gcc-2.95.2 and MingW32" ! # by Ned Konz ! ############################################################################# ! # Assumes standard VMMaker platform tree: ! # ! # <squeak root> => ROOTDIR (where makefile is called from) ! # build => BLDDIR ! # platforms/ ! # Cross/ => CROSSDIR ! # plugins/ ! # Mpeg3Plugin ! # libmpeg ! # vm/ ! # win32/ => PLATDIR ! # misc/ => MISCDIR (location of this makefile) ! # plugins/ ! # vm/ ! # src => SRCDIR ! # plugins/ ! # vm/ => VMDIR ! # plugins.ext ! # plugins.int ! # ! # ! ! ############################################################################# ! # Default commands ! AR = ar rc ! CP = cp ! RM = rm ! # Note: AWK is only necessary for building gnu-interp.c ! AWK = gawk ! ! ############################################################################# ! # Default locations ! # ! ifdef SRCDIR ! ROOTDIR := $(SRCDIR)/.. ! else ! ROOTDIR := $(CURDIR) ! SRCDIR := $(ROOTDIR)/src ! endif ! PLATDIR := $(ROOTDIR)/platforms/win32 ! CROSSDIR := $(ROOTDIR)/platforms/Cross ! MISCDIR := $(PLATDIR)/misc ! BLDDIR := $(ROOTDIR)/build ! OBJDIR := $(BLDDIR) ! VMDIR := $(SRCDIR)/vm ! THISFILE := $(MISCDIR)/Makefile ! ! ! vpath %.o $(OBJDIR) ! vpath %.exe $(BLDDIR) ! ! xx := $(warning ROOTDIR=$(ROOTDIR) MISCDIR=$(MISCDIR) PLATDIR=$(PLATDIR) SRCDIR=$(SRCDIR) BLDDIR=$(BLDDIR)) ! ! # DirectX 7.0 SDK ! DXDIR ?= c:/dx7sdk ! DXINC := $(DXDIR)/include ! ! ############################################################################# ! # Definitions of plugins ! # ! include $(SRCDIR)/plugins.ext ! include $(SRCDIR)/plugins.int ! ! INTERNAL_LIBS = $(addsuffix .lib, $(INTERNAL_PLUGINS)) ! EXTERNAL_LIBS = $(addsuffix .dll, $(EXTERNAL_PLUGINS)) ! ! Mpeg3Plugin_DIR := $(CROSSDIR)/plugins/Mpeg3Plugin ! ! ############################################################################# ! # Default targets ! # ! VM = $(BLDDIR)/Squeak.exe ! ! ! ############################################################################# ! # VM definitions ! # ! VMDEF= $(BLDDIR)/Squeak.def ! VMEXP= $(BLDDIR)/Squeak.exp ! VMLIB= $(BLDDIR)/Squeak.lib ! VMRES= $(BLDDIR)/Squeak.res ! VMDEFIN = $(MISCDIR)/Squeak.def.in ! ! ############################################################################# ! # Generic VM source file definitions ! # ! VMSRC= $(notdir $(wildcard $(VMDIR)/*.c)) $(VMDIR)/gnu-interp.c ! VMOBJ:= $(VMSRC:.c=.o) ! VMOBJ:= $(filter-out interp.o sqFilePrims.o, $(VMOBJ)) ! ! LIBSRC = $(wildcard *.c) ! LIBOBJ = $(LIBSRC:.c=.o) ! ! .PRECIOUS: $(VMDIR)/gnu-interp.c ! #BBCopy-i386.cc ! ! ! ############################################################################# ! # Plugin (DLL) file definitions ! # ! ! # DLLDIR is set through makefile invokation ! DLLDIR = $(SRCDIR)/plugins ! DLLOBJ = $(notdir $(subst .c,.o, $(wildcard $(DLLDIR)/*.c))) \ ! $(notdir $(subst .cc,.o, $(wildcard $(DLLDIR)/*.cc))) \ ! $(notdir $(subst .ccg,.o, $(wildcard $(DLLDIR)/*.ccg))) ! # DLLOBJ = $(DLLSRC:.c=.o) $(DLLSRC:.cc=.o) ! DLLOBJ := $(filter-out sqMac% sqUnix% %-ppc.o, $(DLLOBJ)) ! ! ############################################################################# ! # What object files do we need? ! # ! ALLOBJ= $(VMOBJ) ! ! ############################################################################# ! # Where go the intermediate files? ! # ! VMOUTDIR= $(BLDDIR) ! PLUGINOUTDIR= $(BLDDIR) ! ! ############################################################################# ! # And where to look for files? ! # ! vpath %.c $(SRCDIR) $(VMDIR) $(VMOUTDIR) $(PLUGINOUTDIR) ! ! ############################################################################# ! # C compiler settings (for egcs-1.1.2) ! # ! CC= gcc ! CXX= g++ ! CFLAGS= -g -mpentium -mwindows -O3 -fomit-frame-pointer -funroll-loops -fschedule-insns2 ! CXXFLAGS= $(CFLAGS) -felide-constructors ! WFLAGS= ! DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) ! #-DUSE_DIB_SECTIONS ! #-DPROFILE ! XDEFS= -DSQUEAK_BUILTIN_PLUGIN ! INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(DXINC) $(XINC) ! MD= mkdir ! ! ############################################################################# ! # Linker settings ! # ! # Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols ! # The switch '-mwindows' gives us a GUI app instead of a console app. ! # ! LD= gcc ! LDFLAGS= -mwindows ! STDLIBS= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm -luser32 -lgdi32 -lkernel32 ! CRTLIB = -lcrtdll ! LIBS= $(STDLIBS) $(CRTLIB) ! ! ! ############################################################################# ! # DLL settings ! # ! # Note: DLLTOOL/DLLWRAP does the work for everything related to plugins ! # ! DLLTOOL= dlltool ! DLLWRAP= dllwrap ! ! ############################################################################# ! # RC settings ! # ! # Note: RC compiles the .rc files into linkable .o files ! # !!!WARNING!!! windres can break if you have MacAfee VShield running!!! ! # ! RC= windres ! RCFLAGS= --include-dir $(SRCDIR)/misc ! ! .SUFFIXES: ! .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg ! ! all: $(BLDDIR) $(VMDIR)/gnu-interp.c $(VM) $(EXTERNAL_LIBS) ! ! $(BLDDIR): ! mkdir $(BLDDIR) ! ! ############################################################################# ! # Compiling Squeak itself ! # ! # Mpeg3Plugin.o sqOpenGLRenderer.o sqWin32FilePrims.o ! ! $(VM): $(ALLOBJ) $(INTERNAL_LIBS) $(VMEXP) resource.o ! $(LD) $(LDFLAGS) -o $(VMOUTDIR)/$(VM) $(addprefix $(VMOUTDIR)/,$(ALLOBJ)) $(VMOUTDIR)/$(VMEXP) $(VMOUTDIR)/resource.o $(addprefix $(VMOUTDIR)/,$(INTERNAL_LIBS)) $(LIBS) ! strip --strip-all $(VMOUTDIR)/$(VM) ! ! ############################################################################# ! # The exports for named primitives from Squeak (required by VM) ! # ! $(VMDEF) $(VMEXP) $(VMLIB): $(ALLOBJ) ! $(DLLTOOL) --input-def $(VMDEFIN) --output-def $(VMOUTDIR)/$(VMDEF) --output-exp $(VMOUTDIR)/$(VMEXP) --output-lib $(VMOUTDIR)/$(VMLIB) $(addprefix $(VMOUTDIR)/,$(ALLOBJ)) ! ! ############################################################################# ! # Building plugins ! ! DLL: $(DLLOBJ) ! ! makelib: $(LIBOBJ) ! $(AR) $(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) -f $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def ! ! Mpeg3Plugin.lib: ! @$(MAKE) -C $(DLLDIR)/Mpeg3Plugin -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib ! $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib release/Mpeg3Plugin.lib ! -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib ! ! Mpeg3Plugin.dll: ! @$(MAKE) -C $(DLLDIR)/Mpeg3Plugin -f Makefile.win32 makedll ! $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll release/Mpeg3Plugin.dll ! -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll ! ! %.lib: ! @$(MAKE) -C $(DLLDIR)/% -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib ! $(CP) $(DLLDIR)/%/Mpeg3Plugin.lib release/Mpeg3Plugin.lib ! -$(RM) $(DLLDIR)/%/Mpeg3Plugin.lib ! ! %.dll: ! @$(MAKE) -C $(DLLDIR)/% -f Makefile.win32 makedll ! $(CP) $(DLLDIR)/%/Mpeg3Plugin.dll release/Mpeg3Plugin.dll ! -$(RM) $(DLLDIR)/%/Mpeg3Plugin.dll ! ! %.lib: ! @$(MAKE) -C $(DLLDIR)/$* -f $(THISFILE) SRCDIR=../../ LIB=$*.lib OBJDIR=. XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib ! $(CP) $(DLLDIR)/$*/$*.lib release/$*.lib ! -$(RM) $(DLLDIR)/$*/$*.lib ! ! %.dll: ! @$(MAKE) -C $(DLLDIR)/$* -f $(THISFILE) SRCDIR=../../ LIB=$* OBJDIR=. XDEFS=-DNIX makedll ! $(CP) $(DLLDIR)/$*/$*.dll release/$*.dll ! -$(RM) $(DLLDIR)/$*/$*.dll ! ! ! ############################################################################# ! # Rules for automated builds ! # ! ! Mpeg%.o: ! $(CC) -o $(VMOUTDIR)/$@ $(CFLAGS) -I$(Mpeg3Plugin_DIR) -I$(DLLDIR)/Mpeg3Plugin -I$(Mpeg3Plugin_DIR)/audio -I$(Mpeg3Plugin_DIR)/video $(INCS) $(DEFS) -c $< ! ! .c.o: ! $(CC) -o $(OBJDIR)/$@ $(CFLAGS) $(INCS) $(DEFS) -c $< ! ! .cc.o: ! $(CXX) -o $(OBJDIR)/$@ $(CXXFLAGS) $(INCS) $(DEFS) -c $< ! ! .c.s: ! $(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCS) $(DEFS) -c $< ! ! .cc.s: ! $(CXX) -S -o $@ -fverbose-asm -Wa,ah $(CXXFLAGS) $(INCS) $(DEFS) -c $< ! ! .c.i: ! $(CC) -E -o $@ $(CFLAGS) $(INCS) $(DEFS) -c $< ! ! gnu-%.c: %.c ! $(AWK) -f $(MISCDIR)/gnuify $< > $@ ! ! .rc.res: ! $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ ! ! resource.o: $(VMRES) ! $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ ! ! .cg.c: ! $(CCG) -n -o $@ $< ! ! .hg.h: ! $(CCG) -n -o $@ $< ! ! .ccg.cc: ! $(CCG) -n -o $@ $< ! ! ############################################################################# ! # Extra specific dependencies ! # ! ! sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h ! ! Mpeg3Plugin.o: Mpeg3Plugin.c ! ! $(VMRES): $(MISCDIR)/Squeak.rc ! $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ ! ! ############################################################################# ! # sync-ing sqNamedPrims.h with plugins.int ! # ! MAKEPRIMS=util/makeprims.exe ! ! $(MAKEPRIMS): util/makeprims.c ! gcc -o $(MAKEPRIMS) util/makeprims.c ! ! sqNamedPrims.h: $(SRCDIR)/plugins.int $(MAKEPRIMS) ! $(MAKEPRIMS) vm\\sqNamedPrims.h $(INTERNAL_PLUGINS) ! ! --- 1,362 ---- ! ############################################################################# ! # Makefile for Win32 Squeak using gcc-3.3.3 and MingW32 ! # $Id$ ! # ! # Expects to be invoked from ! # platforms/win32/release directory; i.e., if it lives in the platforms/win32 ! # directory, then build like this: ! # ! # FOR CMD: ! # ! # make -f %PWD%/Makefile -C release SRCDIR=%PWD% %@% ! # ! # OR (for bash): ! # ! # #!/bin/sh ! # make -f $PWD/Makefile -C release SRCDIR=$PWD "$@" ! # ! ############################################################################# ! ! ############################################################################# ! # Default locations; can be overridden ! # ! ! ! # SRCDIR can be set automatically if the current directory is either the ! # platforms/win32/misc or the platforms/win32 directory ! ! ifndef SRCDIR ! ! # try platforms/win32 first ! ifneq ($(wildcard misc/gnuify*),) ! SRCDIR := $(CURDIR) ! else ! # then platforms/win32/* ! ifneq ($(wildcard ../misc/gnuify*),) ! SRCDIR := $(dir $(CURDIR)). ! SRCDIR := $(SRCDIR:/.=) ! else ! # then toplevel ! ifneq ($(wildcard platforms/win32/misc/gnuify*),) ! SRCDIR := $(CURDIR)/platforms/win32 ! else ! $(error Can\'t find SRCDIR) ! endif ! endif ! endif ! $(warning SRCDIR set to $(SRCDIR)) ! endif ! ! BLDDIR ?= $(SRCDIR)/release ! OBJDIR ?= $(BLDDIR) ! VMDIR ?= $(SRCDIR)/vm ! MISCDIR ?= $(SRCDIR)/misc ! UTILDIR ?= $(SRCDIR)/util ! ! export SRCDIR BLDDIR OBJDIR VMDIR MISCDIR UTILDIR ! ! DXDIR ?= c:/dx7sdk ! GNUDIR ?= c:/GNUTools ! ! export DXDIR GNUDIR ! ! # now find the Makefile ! ifndef THISMAKE ! THISMAKE = $(MISCDIR)/Makefile.mingw.gcc33 ! $(warning THISMAKE set to $(THISMAKE)) ! endif ! ! ############################################################################# ! ! AR = ar rc ! CP = cp ! RM = rm ! MD = mkdir ! ! ! ############################################################################# ! # Default targets ! # ! VM= Squeak.exe ! ! ifndef EXTERNAL_PLUGINS ! include $(SRCDIR)/plugins/plugins.ext ! endif ! ! ifndef INTERNAL_PLUGINS ! include $(SRCDIR)/plugins/plugins.int ! endif ! ! INTERNAL_LIBS = $(addsuffix .lib, $(INTERNAL_PLUGINS)) ! EXTERNAL_LIBS = $(addsuffix .dll, $(EXTERNAL_PLUGINS)) ! ! ! ############################################################################# ! # VM definitions ! # ! VMDEF= Squeak.def ! VMEXP= Squeak.exp ! VMLIB= Squeak.lib ! VMRES= Squeak.res ! VMDEFIN=$(MISCDIR)/Squeak.def.in ! ! ############################################################################# ! # Generic VM source file definitions ! # ! VMSRC= $(notdir $(wildcard $(VMDIR)/*.c)) gnu-interp.c ! VMOBJ:= $(VMSRC:.c=.o) ! VMOBJ:= $(filter-out interp.o sqFilePrims.o, $(VMOBJ)) ! # VMOBJ:=$(addprefix $(OBJDIR)/,$(VMOBJ)) ! ! LIBSRC = $(wildcard *.c) ! LIBOBJ = $(LIBSRC:.c=.o) ! # LIBOBJ = $(addprefix $(OBJDIR)/,$(LIBOBJ)) ! ! .PRECIOUS: gnu-interp.c ! #BBCopy-i386.cc ! ! ############################################################################# ! # DirectX definitions ! # ! DXINCDIR=$(DXDIR)/include ! DXLIBDIR=$(DXDIR)/lib ! ! # MinGW definitions ! GNUINCDIR=$(GNUDIR)/include ! GNULIBDIR=$(GNUDIR)/lib ! ! ############################################################################# ! # Plugin (DLL) file definitions ! # ! ! # DLLDIR is set through makefile invokation ! DLLDIR = $(SRCDIR)/plugins ! DLLOBJ = $(notdir $(subst .c,.o, $(wildcard $(DLLDIR)/*.c))) \ ! $(notdir $(subst .cc,.o, $(wildcard $(DLLDIR)/*.cc))) \ ! $(notdir $(subst .ccg,.o, $(wildcard $(DLLDIR)/*.ccg))) ! # DLLOBJ = $(DLLSRC:.c=.o) $(DLLSRC:.cc=.o) ! DLLOBJ := $(filter-out sqMac% sqUnix% %-ppc.o, $(DLLOBJ)) ! ! ############################################################################# ! # What object files do we need? ! # ! ALLOBJ= $(VMOBJ) ! ! ############################################################################# ! # Where go the intermediate files? ! # ! VMOUTDIR= $(BLDDIR) ! ! ############################################################################# ! # And where to look for files? ! # ! vpath %.c $(SRCDIR);$(VMDIR);$(VMOUTDIR) ! vpath %.h $(SRCDIR);$(VMDIR);$(VMOUTDIR) ! ! vpath %.o $(BLDDIR) ! vpath %.lib $(BLDDIR) ! vpath Mpeg%.o $(VMOUTDIR) ! vpath $(VM) $(VMOUTDIR) ! vpath plugins.% $(SRCDIR)/plugins ! vpath sqNamedPrims.% $(VMDIR) ! ! ############################################################################# ! # C compiler settings (for gcc-3.3.3) ! # ! CC= gcc ! CXX= g++ ! ! DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DLSB_FIRST -DX86 $(XDEFS) ! # DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) ! # DEFS= -DMINIMAL -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) ! #-DUSE_DIB_SECTIONS ! #-DPROFILE ! XDEFS= -DSQUEAK_BUILTIN_PLUGIN ! ! INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(GNUINCDIR) -I$(DXINCDIR) $(XINC) ! # INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(GNUINCDIR) $(XINC) ! ! # WFLAGS= -Wall -Wno-unknown-pragmas ! WFLAGS= ! ! CPPFLAGS= $(DEFS) $(INCS) ! CFLAGS= -ggdb3 -mwindows -O3 $(WFLAGS) ! INTERPCFLAGS= -fno-gcse ! ! CXXFLAGS= $(CFLAGS) -felide-constructors ! ! ############################################################################# ! # Linker settings ! # ! # Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols ! # The switch '-mwindows' gives us a GUI app instead of a console app. ! # ! # LD= ld ! LD= gcc ! LDFLAGS= -mwindows -ggdb3 --enable-extra-pe-debug --enable-auto-import ! # LDFLAGS= ! DXLIBS= -ldxguid -lddraw -ldinput ! STDLIBS= -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm -luser32 -lgdi32 -lkernel32 ! CRTLIB = -lcrtdll ! LDFLAGS= -L$(GNULIBDIR) -L$(DXLIBDIR) ! LIBS= $(CRTLIB) $(STDLIBS) $(DXLIBS) ! ! ############################################################################# ! # AWK settings ! # ! # Note: AWK is only necessary for building gnu-interp.c ! # ! AWK= gawk ! ! ############################################################################# ! # DLL settings ! # ! # Note: DLLTOOL/DLLWRAP does the work for everything related to plugins ! # ! DLLTOOL= dlltool ! DLLWRAP= dllwrap ! ! ############################################################################# ! # RC settings ! # ! # Note: RC compiles the .rc files into linkable .o files ! # !!!WARNING!!! windres can break if you have MacAfee VShield running!!! ! # ! RC= windres ! RCFLAGS= --include-dir $(MISCDIR) ! ! .SUFFIXES: ! .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg ! ! all: setup $(VM) $(EXTERNAL_LIBS) ! ! .PHONY: setup ! ! setup: ! ! ############################################################################# ! # Compiling Squeak itself ! # ! # Mpeg3Plugin.o sqOpenGLRenderer.o sqWin32FilePrims.o ! ! # strip --strip-all $(VMOUTDIR)/$(VM) ! $(VM): $(ALLOBJ) $(INTERNAL_LIBS) $(VMEXP) resource.o ! $(LD) $(LDFLAGS) -o $(VMOUTDIR)/$(VM) $(addprefix $(VMOUTDIR)/,$(ALLOBJ)) $(VMOUTDIR)/$(VMEXP) $(VMOUTDIR)/resource.o $(addprefix $(VMOUTDIR)/,$(INTERNAL_LIBS)) $(LIBS) ! ! ############################################################################# ! # The exports for named primitives from Squeak (required by VM) ! # ! $(VMDEF) $(VMEXP) $(VMLIB): $(ALLOBJ) ! $(DLLTOOL) --input-def $(VMDEFIN) --output-def $(VMOUTDIR)/$(VMDEF) --output-exp $(VMOUTDIR)/$(VMEXP) --output-lib $(VMOUTDIR)/$(VMLIB) $(addprefix $(VMOUTDIR)/,$(ALLOBJ)) ! ! ############################################################################# ! # Building plugins ! ! DLL: $(DLLOBJ) ! ! makelib: $(LIBOBJ) ! $(AR) $(LIB) $(LIBOBJ) ! $(RM) $(LIBOBJ) ! ! # strip --strip-all $(OBJDIR)/$(LIB).dll ! 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) ! -$(RM) -f $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def ! ! Mpeg3Plugin.lib: ! @$(MAKE) -C$(DLLDIR)/Mpeg3Plugin -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib ! $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib $(BLDDIR) ! -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib ! ! Mpeg3Plugin.dll: ! @$(MAKE) -C$(DLLDIR)/Mpeg3Plugin -f Makefile.win32 makedll ! $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll $(BLDDIR) ! -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll ! ! %.lib: ! @$(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) SRCDIR=../../ LIB=$*.lib OBJDIR=. XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib ! $(CP) $(DLLDIR)/$*/$*.lib $(BLDDIR) ! -$(RM) $(DLLDIR)/$*/$*.lib ! ! %.dll: ! @$(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) SRCDIR=../../ LIB=$* OBJDIR=. XDEFS=-DNIX makedll ! $(CP) $(DLLDIR)/$*/$*.dll $(BLDDIR) ! -$(RM) $(DLLDIR)/$*/$*.dll ! ! ! ############################################################################# ! # Rules for automated builds ! # ! ! Mpeg%.o: ! $(CC) -o $(VMOUTDIR)/$@ $(CFLAGS) -I$(VMDIR)/libmpeg -I$(DLLDIR)/Mpeg3Plugin -I$(VMDIR)/libmpeg/audio -I$(VMDIR)/libmpeg/video $(INCS) $(DEFS) -c $< ! ! .c.s: ! $(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCS) $(DEFS) -c $< ! ! .cc.s: ! $(CXX) -S -o $@ -fverbose-asm -Wa,ah $(CXXFLAGS) $(INCS) $(DEFS) -c $< ! ! .c.i: ! $(CC) -E -o $@ $(CFLAGS) $(INCS) $(DEFS) -c $< ! ! gnu-%.c: %.c ! $(AWK) -f $(MISCDIR)/gnuify $< > $@ ! ! .rc.res: ! $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ ! ! resource.o: $(VMRES) ! $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ ! ! .cg.c: ! $(CCG) -n -o $@ $< ! ! .hg.h: ! $(CCG) -n -o $@ $< ! ! .ccg.cc: ! $(CCG) -n -o $@ $< ! ! ############################################################################# ! # Extra specific dependencies ! # ! ! sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h ! ! gnu-interp.c: interp.c $(MISCDIR)/gnuify ! ! gnu-interp.o: CFLAGS+=$(INTERPCFLAGS) ! ! Mpeg3Plugin.o: Mpeg3Plugin.c ! ! Squeak.res: $(MISCDIR)/Squeak.rc ! $(RC) $(RCFLAGS) -i $< -o $@ ! ! ############################################################################# ! # sync-ing sqNamedPrims.h with plugins.int ! # ! MAKEPRIMS=$(UTILDIR)/makeprims.exe ! ! $(MAKEPRIMS): $(UTILDIR)/makeprims.c ! gcc -o $(MAKEPRIMS) $(UTILDIR)/makeprims.c ! ! $(VMDIR)/sqNamedPrims.h: plugins.int $(MAKEPRIMS) ! $(MAKEPRIMS) $@ $(INTERNAL_PLUGINS) ! ! .PHONY: clean ! clean: ! -$(RM) -f $(VM) $(EXTERNAL_LIBS) $(ALLOBJ) ! ! tags: ! ctags -R $(SRCDIR)/../.. |
|
From: Ned K. <ne...@us...> - 2004-07-09 01:29:01
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8335/win32/misc Added Files: Tag: ned-branch Makefile.mingw.gcc33 Log Message: GCC 3.3 compatibility. --- NEW FILE: Makefile.mingw.gcc33 --- ############################################################################# # Makefile for Win32 Squeak using gcc-3.3.1 and MingW32 # Modified from Andreas Raab's # "Makefile for Win32 Squeak using gcc-2.95.2 and MingW32" # by Ned Konz ############################################################################# # Assumes standard VMMaker platform tree: # # <squeak root> => ROOTDIR (where makefile is called from) # build => BLDDIR # platforms/ # Cross/ => CROSSDIR # plugins/ # Mpeg3Plugin # libmpeg # vm/ # win32/ => PLATDIR # misc/ => MISCDIR (location of this makefile) # plugins/ # vm/ # src => SRCDIR # plugins/ # vm/ => VMDIR # plugins.ext # plugins.int # # ############################################################################# # Default commands AR = ar rc CP = cp RM = rm # Note: AWK is only necessary for building gnu-interp.c AWK = gawk ############################################################################# # Default locations # ifdef SRCDIR ROOTDIR := $(SRCDIR)/.. else ROOTDIR := $(CURDIR) SRCDIR := $(ROOTDIR)/src endif PLATDIR := $(ROOTDIR)/platforms/win32 CROSSDIR := $(ROOTDIR)/platforms/Cross MISCDIR := $(PLATDIR)/misc BLDDIR := $(ROOTDIR)/build OBJDIR := $(BLDDIR) VMDIR := $(SRCDIR)/vm THISFILE := $(MISCDIR)/Makefile vpath %.o $(OBJDIR) vpath %.exe $(BLDDIR) xx := $(warning ROOTDIR=$(ROOTDIR) MISCDIR=$(MISCDIR) PLATDIR=$(PLATDIR) SRCDIR=$(SRCDIR) BLDDIR=$(BLDDIR)) # DirectX 7.0 SDK DXDIR ?= c:/dx7sdk DXINC := $(DXDIR)/include ############################################################################# # Definitions of plugins # include $(SRCDIR)/plugins.ext include $(SRCDIR)/plugins.int INTERNAL_LIBS = $(addsuffix .lib, $(INTERNAL_PLUGINS)) EXTERNAL_LIBS = $(addsuffix .dll, $(EXTERNAL_PLUGINS)) Mpeg3Plugin_DIR := $(CROSSDIR)/plugins/Mpeg3Plugin ############################################################################# # Default targets # VM = $(BLDDIR)/Squeak.exe ############################################################################# # VM definitions # VMDEF= $(BLDDIR)/Squeak.def VMEXP= $(BLDDIR)/Squeak.exp VMLIB= $(BLDDIR)/Squeak.lib VMRES= $(BLDDIR)/Squeak.res VMDEFIN = $(MISCDIR)/Squeak.def.in ############################################################################# # Generic VM source file definitions # VMSRC= $(notdir $(wildcard $(VMDIR)/*.c)) $(VMDIR)/gnu-interp.c VMOBJ:= $(VMSRC:.c=.o) VMOBJ:= $(filter-out interp.o sqFilePrims.o, $(VMOBJ)) LIBSRC = $(wildcard *.c) LIBOBJ = $(LIBSRC:.c=.o) .PRECIOUS: $(VMDIR)/gnu-interp.c #BBCopy-i386.cc ############################################################################# # Plugin (DLL) file definitions # # DLLDIR is set through makefile invokation DLLDIR = $(SRCDIR)/plugins DLLOBJ = $(notdir $(subst .c,.o, $(wildcard $(DLLDIR)/*.c))) \ $(notdir $(subst .cc,.o, $(wildcard $(DLLDIR)/*.cc))) \ $(notdir $(subst .ccg,.o, $(wildcard $(DLLDIR)/*.ccg))) # DLLOBJ = $(DLLSRC:.c=.o) $(DLLSRC:.cc=.o) DLLOBJ := $(filter-out sqMac% sqUnix% %-ppc.o, $(DLLOBJ)) ############################################################################# # What object files do we need? # ALLOBJ= $(VMOBJ) ############################################################################# # Where go the intermediate files? # VMOUTDIR= $(BLDDIR) PLUGINOUTDIR= $(BLDDIR) ############################################################################# # And where to look for files? # vpath %.c $(SRCDIR) $(VMDIR) $(VMOUTDIR) $(PLUGINOUTDIR) ############################################################################# # C compiler settings (for egcs-1.1.2) # CC= gcc CXX= g++ CFLAGS= -g -mpentium -mwindows -O3 -fomit-frame-pointer -funroll-loops -fschedule-insns2 CXXFLAGS= $(CFLAGS) -felide-constructors WFLAGS= DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) #-DUSE_DIB_SECTIONS #-DPROFILE XDEFS= -DSQUEAK_BUILTIN_PLUGIN INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(DXINC) $(XINC) MD= mkdir ############################################################################# # Linker settings # # Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols # The switch '-mwindows' gives us a GUI app instead of a console app. # LD= gcc LDFLAGS= -mwindows STDLIBS= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm -luser32 -lgdi32 -lkernel32 CRTLIB = -lcrtdll LIBS= $(STDLIBS) $(CRTLIB) ############################################################################# # DLL settings # # Note: DLLTOOL/DLLWRAP does the work for everything related to plugins # DLLTOOL= dlltool DLLWRAP= dllwrap ############################################################################# # RC settings # # Note: RC compiles the .rc files into linkable .o files # !!!WARNING!!! windres can break if you have MacAfee VShield running!!! # RC= windres RCFLAGS= --include-dir $(SRCDIR)/misc .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg all: $(BLDDIR) $(VMDIR)/gnu-interp.c $(VM) $(EXTERNAL_LIBS) $(BLDDIR): mkdir $(BLDDIR) ############################################################################# # Compiling Squeak itself # # Mpeg3Plugin.o sqOpenGLRenderer.o sqWin32FilePrims.o $(VM): $(ALLOBJ) $(INTERNAL_LIBS) $(VMEXP) resource.o $(LD) $(LDFLAGS) -o $(VMOUTDIR)/$(VM) $(addprefix $(VMOUTDIR)/,$(ALLOBJ)) $(VMOUTDIR)/$(VMEXP) $(VMOUTDIR)/resource.o $(addprefix $(VMOUTDIR)/,$(INTERNAL_LIBS)) $(LIBS) strip --strip-all $(VMOUTDIR)/$(VM) ############################################################################# # The exports for named primitives from Squeak (required by VM) # $(VMDEF) $(VMEXP) $(VMLIB): $(ALLOBJ) $(DLLTOOL) --input-def $(VMDEFIN) --output-def $(VMOUTDIR)/$(VMDEF) --output-exp $(VMOUTDIR)/$(VMEXP) --output-lib $(VMOUTDIR)/$(VMLIB) $(addprefix $(VMOUTDIR)/,$(ALLOBJ)) ############################################################################# # Building plugins DLL: $(DLLOBJ) makelib: $(LIBOBJ) $(AR) $(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) -f $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def Mpeg3Plugin.lib: @$(MAKE) -C $(DLLDIR)/Mpeg3Plugin -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib release/Mpeg3Plugin.lib -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib Mpeg3Plugin.dll: @$(MAKE) -C $(DLLDIR)/Mpeg3Plugin -f Makefile.win32 makedll $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll release/Mpeg3Plugin.dll -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll %.lib: @$(MAKE) -C $(DLLDIR)/% -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib $(CP) $(DLLDIR)/%/Mpeg3Plugin.lib release/Mpeg3Plugin.lib -$(RM) $(DLLDIR)/%/Mpeg3Plugin.lib %.dll: @$(MAKE) -C $(DLLDIR)/% -f Makefile.win32 makedll $(CP) $(DLLDIR)/%/Mpeg3Plugin.dll release/Mpeg3Plugin.dll -$(RM) $(DLLDIR)/%/Mpeg3Plugin.dll %.lib: @$(MAKE) -C $(DLLDIR)/$* -f $(THISFILE) SRCDIR=../../ LIB=$*.lib OBJDIR=. XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib $(CP) $(DLLDIR)/$*/$*.lib release/$*.lib -$(RM) $(DLLDIR)/$*/$*.lib %.dll: @$(MAKE) -C $(DLLDIR)/$* -f $(THISFILE) SRCDIR=../../ LIB=$* OBJDIR=. XDEFS=-DNIX makedll $(CP) $(DLLDIR)/$*/$*.dll release/$*.dll -$(RM) $(DLLDIR)/$*/$*.dll ############################################################################# # Rules for automated builds # Mpeg%.o: $(CC) -o $(VMOUTDIR)/$@ $(CFLAGS) -I$(Mpeg3Plugin_DIR) -I$(DLLDIR)/Mpeg3Plugin -I$(Mpeg3Plugin_DIR)/audio -I$(Mpeg3Plugin_DIR)/video $(INCS) $(DEFS) -c $< .c.o: $(CC) -o $(OBJDIR)/$@ $(CFLAGS) $(INCS) $(DEFS) -c $< .cc.o: $(CXX) -o $(OBJDIR)/$@ $(CXXFLAGS) $(INCS) $(DEFS) -c $< .c.s: $(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCS) $(DEFS) -c $< .cc.s: $(CXX) -S -o $@ -fverbose-asm -Wa,ah $(CXXFLAGS) $(INCS) $(DEFS) -c $< .c.i: $(CC) -E -o $@ $(CFLAGS) $(INCS) $(DEFS) -c $< gnu-%.c: %.c $(AWK) -f $(MISCDIR)/gnuify $< > $@ .rc.res: $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ resource.o: $(VMRES) $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ .cg.c: $(CCG) -n -o $@ $< .hg.h: $(CCG) -n -o $@ $< .ccg.cc: $(CCG) -n -o $@ $< ############################################################################# # Extra specific dependencies # sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Mpeg3Plugin.o: Mpeg3Plugin.c $(VMRES): $(MISCDIR)/Squeak.rc $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ ############################################################################# # sync-ing sqNamedPrims.h with plugins.int # MAKEPRIMS=util/makeprims.exe $(MAKEPRIMS): util/makeprims.c gcc -o $(MAKEPRIMS) util/makeprims.c sqNamedPrims.h: $(SRCDIR)/plugins.int $(MAKEPRIMS) $(MAKEPRIMS) vm\\sqNamedPrims.h $(INTERNAL_PLUGINS) |
|
From: Ian P. <piu...@us...> - 2004-06-12 01:09:42
|
Update of /cvsroot/squeak/squeak/platforms/unix/plugins/SocketPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7719 Modified Files: sqUnixSocket.c Log Message: Nul-terminate socket option names before looking them up. Index: sqUnixSocket.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** sqUnixSocket.c 3 Apr 2004 10:22:04 -0000 1.14 --- sqUnixSocket.c 12 Jun 2004 01:09:33 -0000 1.15 *************** *** 1,14 **** /* sqUnixSocket.c -- Unix socket support * ! * Copyright (C) 1996-2003 Ian Piumarta and other authors/contributors ! * as listed elsewhere in this file. * All rights reserved. * - * You are NOT ALLOWED to distribute modified versions of this file - * under its original name. If you want to modify it and then make - * your modifications available publicly, rename the file first. - * * This file is part of Unix Squeak. * * This file is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --- 1,14 ---- /* sqUnixSocket.c -- Unix socket support * ! * Copyright (C) 1996-2004 by Ian Piumarta and other authors/contributors ! * listed elsewhere in this file. * All rights reserved. * * This file is part of Unix Squeak. * + * You are NOT ALLOWED to distribute modified versions of this file + * under its original name. If you modify this file then you MUST + * rename it before making your modifications available publicly. + * * This file is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *************** *** 37,41 **** /* Author: Ian...@in... * ! * Last edited: 2004-04-02 14:21:17 by piumarta on emilia.local * * Support for BSD-style "accept" primitives contributed by: --- 37,41 ---- /* Author: Ian...@in... * ! * Last edited: 2004-05-26 23:03:37 by piumarta on LPA-wlan-3-6.external.hpl.hp.com * * Support for BSD-style "accept" primitives contributed by: *************** *** 1248,1257 **** static socketOption *findOption(char *name, size_t nameSize) { ! socketOption *opt= 0; ! char buf[32]; ! strncpy(buf, name, nameSize); ! for (opt= socketOptions; opt->name != 0; ++opt) ! if (!strcmp(buf, opt->name)) ! return opt; return 0; } --- 1248,1261 ---- static socketOption *findOption(char *name, size_t nameSize) { ! if (nameSize < 32) ! { ! socketOption *opt= 0; ! char buf[32]; ! buf[nameSize]= '\0'; ! strncpy(buf, name, nameSize); ! for (opt= socketOptions; opt->name != 0; ++opt) ! if (!strcmp(buf, opt->name)) ! return opt; ! } return 0; } |
|
From: Ian P. <piu...@us...> - 2004-06-12 01:08:59
|
Update of /cvsroot/squeak/squeak/platforms/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7352 Modified Files: ChangeLog Log Message: Recent modifications. Index: ChangeLog =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ChangeLog 17 Apr 2004 00:48:27 -0000 1.23 --- ChangeLog 12 Jun 2004 01:08:46 -0000 1.24 *************** *** 1,2 **** --- 1,7 ---- + 2004-05-26 Ian Piumarta <ian...@in...> + + * platforms/unix/plugins/SocketPlugin/sqUnixSocket.c (findOption): + Nul-terminate the converted option name before looking it up. + 2004-04-17 Ian Piumarta <ian...@in...> |
|
From: Tim R. <row...@us...> - 2004-05-24 18:22:41
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16590 Added Files: TimerMod,ffa Log Message: Attempt to restore badly uploaded binary - part 4, re-add as binary ***** Bogus filespec: TimerMod,ffa,1.3,1.4 |
|
From: Tim R. <row...@us...> - 2004-05-24 18:21:41
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16314 Removed Files: TimerMod,ffa Log Message: Attempt to restore badly uploaded binary - part 3, remove ***** Bogus filespec: TimerMod,ffa,1.2,NONE |
