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...> - 2004-09-24 00:31:33
|
Update of /cvsroot/squeak/squeak/platforms/win32/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25790/win32/vm Modified Files: sqWin32.h Log Message: Updated to 3.7.1 Index: sqWin32.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** sqWin32.h 12 Nov 2003 22:38:21 -0000 1.14 --- sqWin32.h 24 Sep 2004 00:31:13 -0000 1.15 *************** *** 242,246 **** #endif ! #define SQUEAK_VM_VERSION TEXT("Squeak 3.6.2 / Tea 1.9 VM (release) from ") TEXT(__DATE__) \ TEXT("\n") TEXT("Compiler: ") TEXT(COMPILER) TEXT(VERSION) --- 242,246 ---- #endif ! #define SQUEAK_VM_VERSION TEXT("Squeak 3.7.1 (release) from ") TEXT(__DATE__) \ TEXT("\n") TEXT("Compiler: ") TEXT(COMPILER) TEXT(VERSION) |
|
From: Andreas R. <and...@us...> - 2004-09-24 00:31:33
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25790/win32/misc Modified Files: makefile.cvs Log Message: Updated to 3.7.1 Index: makefile.cvs =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/makefile.cvs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.cvs 5 May 2002 17:18:02 -0000 1.3 --- makefile.cvs 24 Sep 2004 00:31:12 -0000 1.4 *************** *** 1,64 **** ! # CVS specific makefile ! # ! # Targets: ! # update: update all files from cvs@sourceforge ! # commit: commit changes to win32 tree to cvs@sourceforge ! # commit-cross: commit cross platform changes to cvs@sourceforge ! # ! # IMPORTANT: ! # In order to be able to check in CVS files you MUST have checked ! # them out with a valid user account from SF. CVS sucks (yeah, big time) ! # since it will treat a different user name and authorization scheme ! # (e.g. pserver vs. ext) as different CVS root locations (hah!). ! # In other words, if you do _not_ provide a valid account at check out ! # time you will not be able to check the files in anymore. ! # My recommendation is to insert a valid CVSUSER right below as the ! # very first thing to do. ! ! # Note to developers: ! # The following is a place where you may add your 'common' ! # user names, so you don't have to remember it all the time. ! ! ifndef CVSUSER ! ifeq ($(USERNAME), andreas) ! CVSUSER=AndreasRaab ! endif ! endif ! ! ifdef CVSUSER ! ! # ! # if CVSUSER is present use :ext:user@ so we can commit changes ! # ! ! update: ! cvs -z3 -d:ext:$(CVSUSER)@cvs.squeak.sourceforge.net:/cvsroot/squeak co win32-solo Cross-solo ! commit: ! cvs -z3 -d:ext:$(CVSUSER)@cvs.squeak.sourceforge.net:/cvsroot/squeak commit win32 ! ! commit-cross: ! cvs -z3 -d:ext:$(CVSUSER)@cvs.squeak.sourceforge.net:/cvsroot/squeak commit cross ! ! else ! ! # ! # if CVSUSER is absent use :pserver:anon for checkouts ! # ! ! update: ! @echo ***************************************************** ! @echo ***************************************************** ! @echo ATTENTION: ! @echo When asked for a password, just hit ENTER ! @echo ***************************************************** ! @echo ***************************************************** ! cvs -d:pserver:ano...@cv...:/cvsroot/squeak login ! cvs -z3 -d:pserver:ano...@cv...:/cvsroot/squeak co win32-solo Cross-solo ! ! endif ! ! export: ! 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 --- 1,67 ---- ! # CVS specific makefile ! # ! # Targets: ! # update: update all files from cvs@sourceforge ! # commit: commit changes to win32 tree to cvs@sourceforge ! # commit-cross: commit cross platform changes to cvs@sourceforge ! # ! # IMPORTANT: ! # In order to be able to check in CVS files you MUST have checked ! # them out with a valid user account from SF. CVS sucks (yeah, big time) ! # since it will treat a different user name and authorization scheme ! # (e.g. pserver vs. ext) as different CVS root locations (hah!). ! # In other words, if you do _not_ provide a valid account at check out ! # time you will not be able to check the files in anymore. ! # My recommendation is to insert a valid CVSUSER right below as the ! # very first thing to do. ! ! # Note to developers: ! # The following is a place where you may add your 'common' ! # user names, so you don't have to remember it all the time. ! ! ifndef CVSUSER ! ifeq ($(USERNAME), andreas) ! CVSUSER=AndreasRaab ! endif ! ifeq ($(USERNAME), ANDREASR) ! CVSUSER=AndreasRaab ! endif ! endif ! ! ifdef CVSUSER ! ! # ! # if CVSUSER is present use :ext:user@ so we can commit changes ! # ! ! update: ! cvs -z3 -d:ext:$(CVSUSER)@cvs.sourceforge.net:/cvsroot/squeak co win32-solo Cross-solo ! commit: ! cvs -z3 -d:ext:$(CVSUSER)@cvs.sourceforge.net:/cvsroot/squeak commit win32 ! ! commit-cross: ! cvs -z3 -d:ext:$(CVSUSER)@cvs.sourceforge.net:/cvsroot/squeak commit cross ! ! else ! ! # ! # if CVSUSER is absent use :pserver:anon for checkouts ! # ! ! update: ! @echo ***************************************************** ! @echo ***************************************************** ! @echo ATTENTION: ! @echo When asked for a password, just hit ENTER ! @echo ***************************************************** ! @echo ***************************************************** ! cvs -d:pserver:ano...@cv...:/cvsroot/squeak login ! cvs -z3 -d:pserver:ano...@cv...:/cvsroot/squeak co win32-solo Cross-solo ! ! endif ! ! export: ! 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: John M M. <jo...@us...> - 2004-09-23 21:48:02
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23270/squeak/platforms/Mac OS/vm/Developer Modified Files: resources.sit Log Message: 3.7.5b3 update version number information Index: resources.sit =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/resources.sit,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsf06IhI and /tmp/cvs7eTyM8 differ |
|
From: John M M. <jo...@us...> - 2004-09-23 16:33:43
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16254/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin Modified Files: sqMacOpenGLInfo.c Log Message: 3.7.5b4 Fix compiler warning messages. Index: sqMacOpenGLInfo.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sqMacOpenGLInfo.c 22 Sep 2004 18:56:40 -0000 1.4 --- sqMacOpenGLInfo.c 23 Sep 2004 16:33:34 -0000 1.5 *************** *** 46,50 **** /* define forceFlush if we should fflush() before closing file */ #define forceFlush 1 ! FILE * xopenf(char *filename,char* attr); #include "sqMacFileLogic.h" --- 46,50 ---- /* define forceFlush if we should fflush() before closing file */ #define forceFlush 1 ! static FILE * xopenf(char *filename,char* attr); #include "sqMacFileLogic.h" |
|
From: John M M. <jo...@us...> - 2004-09-23 16:33:37
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16235/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin Modified Files: sqMacOpenGL.c Log Message: 3.7.5b4 Fix compiler warning messages. Index: sqMacOpenGL.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** sqMacOpenGL.c 22 Sep 2004 18:56:33 -0000 1.10 --- sqMacOpenGL.c 23 Sep 2004 16:33:26 -0000 1.11 *************** *** 94,98 **** #define forceFlush 1 ! FILE *xopenf(char *filename,char* attr); #include "sqMacFileLogic.h" --- 94,98 ---- #define forceFlush 1 ! static FILE *xopenf(char *filename,char* attr); #include "sqMacFileLogic.h" |
|
From: John M M. <jo...@us...> - 2004-09-23 16:33:28
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16205/squeak/platforms/Mac OS/vm Modified Files: sqMacExternalPrims.c Log Message: 3.7.5b4 Fix compiler warning messages. Index: sqMacExternalPrims.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacExternalPrims.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sqMacExternalPrims.c 3 Sep 2004 00:20:19 -0000 1.8 --- sqMacExternalPrims.c 23 Sep 2004 16:33:19 -0000 1.9 *************** *** 225,229 **** /* copy the file name into a null-terminated C string */ ! sqFilenameFromString(cFileName, tempDirPath, strlen(tempDirPath)); filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),gCurrentVMEncoding,false); --- 225,229 ---- /* copy the file name into a null-terminated C string */ ! sqFilenameFromString(cFileName, (int) tempDirPath, strlen(tempDirPath)); filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),gCurrentVMEncoding,false); |
|
From: John M M. <jo...@us...> - 2004-09-23 16:32:58
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16093/squeak/platforms/Mac OS/vm/Developer Modified Files: Info-Squeak_VM_OPT__Upgraded_.plist Log Message: 3.7.5b3 Version number change Index: Info-Squeak_VM_OPT__Upgraded_.plist =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/Info-Squeak_VM_OPT__Upgraded_.plist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info-Squeak_VM_OPT__Upgraded_.plist 2 Sep 2004 23:10:19 -0000 1.2 --- Info-Squeak_VM_OPT__Upgraded_.plist 23 Sep 2004 16:32:49 -0000 1.3 *************** *** 365,369 **** <string>Squeak VM Opt</string> <key>CFBundleGetInfoString</key> ! <string>Squeak VM 3.7.5b1 http://www.squeak.org </string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> --- 365,369 ---- <string>Squeak VM Opt</string> <key>CFBundleGetInfoString</key> ! <string>Squeak VM 3.7.5b3 http://www.squeak.org </string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> *************** *** 377,385 **** <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>Squeak VM 3.7.5b1</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> ! <string>3.7.5b1</string> <key>SqueakEncodingType</key> <string>macintosh</string> --- 377,385 ---- <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>Squeak VM 3.7.5b3</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> ! <string>3.7.5b3</string> <key>SqueakEncodingType</key> <string>macintosh</string> |
|
From: John M M. <jo...@us...> - 2004-09-23 16:32:51
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16050/squeak/platforms/Mac OS/vm/Developer Modified Files: Info-Squeak_VM_Debug__Upgraded_.plist Log Message: 3.7.5b3 Version number change Index: Info-Squeak_VM_Debug__Upgraded_.plist =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/Info-Squeak_VM_Debug__Upgraded_.plist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info-Squeak_VM_Debug__Upgraded_.plist 2 Sep 2004 23:10:11 -0000 1.2 --- Info-Squeak_VM_Debug__Upgraded_.plist 23 Sep 2004 16:32:41 -0000 1.3 *************** *** 335,339 **** <string>Squeak</string> <key>CFBundleGetInfoString</key> ! <string>Squeak VM 3.7.5b1 http://www.squeak.org </string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> --- 335,339 ---- <string>Squeak</string> <key>CFBundleGetInfoString</key> ! <string>Squeak VM 3.7.5b3 http://www.squeak.org </string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> *************** *** 347,355 **** <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>Squeak VM 3.7.5b1</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> ! <string>3.7.5b1</string> <key>SqueakEncodingType</key> <string>UTF-8</string> --- 347,355 ---- <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>Squeak VM 3.7.5b3</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> ! <string>3.7.5b3</string> <key>SqueakEncodingType</key> <string>UTF-8</string> |
|
From: John M M. <jo...@us...> - 2004-09-23 16:32:47
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16011/squeak/platforms/Mac OS/vm/Developer Modified Files: Info-NPSqueak__Upgraded_.plist Log Message: 3.7.5b3 Version number change Index: Info-NPSqueak__Upgraded_.plist =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/Info-NPSqueak__Upgraded_.plist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info-NPSqueak__Upgraded_.plist 2 Sep 2004 23:09:50 -0000 1.2 --- Info-NPSqueak__Upgraded_.plist 23 Sep 2004 16:32:34 -0000 1.3 *************** *** 8,12 **** <string>NPSqueak</string> <key>CFBundleGetInfoString</key> ! <string>Squeak Browser Plugin 3.7.5b1 http://www.squeak.org </string> <key>CFBundleIconFile</key> <string>resources/ProjectBuilder/SqueakPlugin.icns</string> --- 8,12 ---- <string>NPSqueak</string> <key>CFBundleGetInfoString</key> ! <string>Squeak Browser Plugin 3.7.5b3 http://www.squeak.org </string> <key>CFBundleIconFile</key> <string>resources/ProjectBuilder/SqueakPlugin.icns</string> *************** *** 20,28 **** <string>BRPL</string> <key>CFBundleShortVersionString</key> ! <string>Squeak Browser Plugin 3.7.5b1</string> <key>CFBundleSignature</key> <string>MOSS</string> <key>CFBundleVersion</key> ! <string>3.7.5b1</string> <key>SqueakEncodingType</key> <string>macintosh</string> --- 20,28 ---- <string>BRPL</string> <key>CFBundleShortVersionString</key> ! <string>Squeak Browser Plugin 3.7.5b3</string> <key>CFBundleSignature</key> <string>MOSS</string> <key>CFBundleVersion</key> ! <string>3.7.5b2</string> <key>SqueakEncodingType</key> <string>macintosh</string> |
|
From: John M M. <jo...@us...> - 2004-09-22 18:56:49
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7571/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin Modified Files: sqMacOpenGLInfo.c Log Message: 3.7.5b3 Change logic when we open 3d log file. Ensure we open in working directory, not the root directory. Also fix problems with open on os9, I doubt it worked on that platform before Index: sqMacOpenGLInfo.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sqMacOpenGLInfo.c 6 Feb 2002 06:57:19 -0000 1.3 --- sqMacOpenGLInfo.c 22 Sep 2004 18:56:40 -0000 1.4 *************** *** 27,30 **** --- 27,33 ---- #endif + #include "sq.h" + #include "sqVirtualMachine.h" + int printRendererInfo(void); int printFormatInfo(AGLPixelFormat info); *************** *** 43,52 **** /* define forceFlush if we should fflush() before closing file */ #define forceFlush 1 /* Note: Print this stuff into a file in case we lock up*/ #undef DPRINTF # define DPRINTF(vLevel, args) if(vLevel <= verboseLevel) {\ ! FILE *fp = fopen("Squeak3D.log", "at");\ if(fp) { fprintf args; if(forceFlush) fflush(fp); fclose(fp); }} /*****************************************************************************/ --- 46,79 ---- /* define forceFlush if we should fflush() before closing file */ #define forceFlush 1 + FILE * xopenf(char *filename,char* attr); + #include "sqMacFileLogic.h" + + static FILE *xopenf(char *filename,char* attr) { + FSSpec imageSpec; + char fullName[1024]; + FILE *fp; + makeFSSpec("", 0, &imageSpec); + PathToFile(fullName,sizeof(fullName),&imageSpec,gCurrentVMEncoding); + strcat(fullName,filename); + fp = fopen(fullName, attr); + return fp; + } + + + /* Note: Print this stuff into a file in case we lock up*/ /* Note: Print this stuff into a file in case we lock up*/ #undef DPRINTF + #if defined (__APPLE__) && defined(__MACH__) # define DPRINTF(vLevel, args) if(vLevel <= verboseLevel) {\ ! char fileName[1024]; \ ! sqFilenameFromStringOpen(fileName,(long) &":Squeak3D.log", strlen(":Squeak3D.log")); \ ! FILE *fp = fopen(fileName, "at");\ if(fp) { fprintf args; if(forceFlush) fflush(fp); fclose(fp); }} + #else + # define DPRINTF(vLevel, args) if(vLevel <= verboseLevel) {\ + FILE *fp = xopenf("Squeak3D.log", "at");\ + if(fp) { fprintf args; if(forceFlush) fflush(fp); fclose(fp); }} + #endif /*****************************************************************************/ |
|
From: John M M. <jo...@us...> - 2004-09-22 18:56:42
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7530/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin Modified Files: sqMacOpenGL.c Log Message: 3.7.5b3 Change logic when we open 3d log file. Ensure we open in working directory, not the root directory. Also fix problems with open on os9, I doubt it worked on that platform before Index: sqMacOpenGL.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sqMacOpenGL.c 3 Aug 2004 02:41:16 -0000 1.9 --- sqMacOpenGL.c 22 Sep 2004 18:56:33 -0000 1.10 *************** *** 37,43 **** --- 37,48 ---- #include <Events.h> #endif + /* Do not include the entire sq.h file but just those parts needed. */ + /* The virtual machine proxy definition */ #include "sqVirtualMachine.h" + /* Configuration options */ #include "sqConfig.h" + /* Platform specific definitions */ #include "sqPlatformSpecific.h" + #include "B3DAcceleratorPlugin.h" #include "sqMacOpenGL.h" *************** *** 89,97 **** #define forceFlush 1 /* Note: Print this stuff into a file in case we lock up*/ #undef DPRINTF # define DPRINTF(vLevel, args) if(vLevel <= verboseLevel) {\ ! FILE *fp = fopen("Squeak3D.log", "at");\ if(fp) { fprintf args; if(forceFlush) fflush(fp); fclose(fp); }} /* Plugin refs */ --- 94,124 ---- #define forceFlush 1 + FILE *xopenf(char *filename,char* attr); + #include "sqMacFileLogic.h" + + static FILE *xopenf(char *filename,char* attr) { + FSSpec imageSpec; + char fullName[1024]; + FILE *fp; + makeFSSpec("", 0, &imageSpec); + PathToFile(fullName,sizeof(fullName),&imageSpec,gCurrentVMEncoding); + strcat(fullName,filename); + fp = fopen(fullName, attr); + return fp; + } + /* Note: Print this stuff into a file in case we lock up*/ #undef DPRINTF + #if defined (__APPLE__) && defined(__MACH__) # define DPRINTF(vLevel, args) if(vLevel <= verboseLevel) {\ ! char fileName[1024]; \ ! sqFilenameFromStringOpen(fileName,(long) &":Squeak3D.log", strlen(":Squeak3D.log")); \ ! FILE *fp = fopen(fileName, "at");\ if(fp) { fprintf args; if(forceFlush) fflush(fp); fclose(fp); }} + #else + # define DPRINTF(vLevel, args) if(vLevel <= verboseLevel) {\ + FILE *fp = xopenf("Squeak3D.log", "at");\ + if(fp) { fprintf args; if(forceFlush) fflush(fp); fclose(fp); }} + #endif /* Plugin refs */ |
|
From: John M M. <jo...@us...> - 2004-09-22 18:55:33
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7223/squeak/platforms/Mac OS/vm Modified Files: sqMacNSPlugin.c Log Message: 3.7.5b3 Minor changes to better support full screen mode Index: sqMacNSPlugin.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacNSPlugin.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** sqMacNSPlugin.c 3 Aug 2004 02:46:43 -0000 1.17 --- sqMacNSPlugin.c 22 Sep 2004 18:55:24 -0000 1.18 *************** *** 78,81 **** --- 78,82 ---- #include "sqMacImageIO.h" #include "sqMacEncoding.h" + #include "sqMacMemory.h" #include <Events.h> *************** *** 226,230 **** extern PixMapHandle stPixMap; extern ThreadID gSqueakThread; - GDHandle getDominateDevice( WindowPtr theWindow,Rect *windRect); int checkForModifierKeys(); --- 227,230 ---- *************** *** 965,968 **** --- 965,970 ---- if (squeakHeapMBytes == 0) squeakHeapMBytes = STARTINGsqueakHeapMBytes; + if (squeakHeapMBytes < sqGetAvailableMemory()) + squeakHeapMBytes = sqGetAvailableMemory(); readImageFromFileHeapSizeStartingAt(f, squeakHeapMBytes, 0); *************** *** 1234,1238 **** int ioSetFullScreen(int fullScreen) { short desiredWidth,desiredHeight; - Rect windRect; GDHandle dominantGDevice; --- 1236,1239 ---- *************** *** 1244,1252 **** oldNetscapeWindow = netscapeWindow; oldStWindow = stWindow; ! #if defined ( __APPLE__ ) && defined ( __MACH__ ) ! GetWindowGreatestAreaDevice((WindowPtr) FrontWindow(),kWindowContentRgn,&dominantGDevice,&windRect); ! #else ! dominantGDevice = getDominateDevice(stWindow,&windRect); ! #endif setFullScreenFlag(true); //JMM Moved before to test BeginFullScreen (&gRestorableStateForScreen, --- 1245,1249 ---- oldNetscapeWindow = netscapeWindow; oldStWindow = stWindow; ! dominantGDevice = getThatDominateGDevice(); setFullScreenFlag(true); //JMM Moved before to test BeginFullScreen (&gRestorableStateForScreen, |
|
From: John M M. <jo...@us...> - 2004-09-22 18:54:46
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7018/squeak/platforms/Mac OS/vm Modified Files: sqMacWindow.h Log Message: 3.7.5b3 Alter full screen entry/exit logic to correct issues with restore and how it handles starting in full screen mode Index: sqMacWindow.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sqMacWindow.h 20 Jun 2003 01:56:32 -0000 1.3 --- sqMacWindow.h 22 Sep 2004 18:54:37 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- * May 5th, 2002, JMM build as NS plugin * Jun 7th, 2003, JMM fix up full screen threading issue + * Sept 11th, 2004, JMM add getDominateScreen ****************************************************************************/ *************** *** 26,27 **** --- 27,29 ---- void SetUpPixmap(void); void FreePixmap(void); + GDHandle getThatDominateGDevice(void); |
|
From: John M M. <jo...@us...> - 2004-09-22 18:54:40
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6982/squeak/platforms/Mac OS/vm Modified Files: sqMacWindow.c Log Message: 3.7.5b3 Alter full screen entry/exit logic to correct issues with restore and how it handles starting in full screen mode Index: sqMacWindow.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** sqMacWindow.c 3 Sep 2004 00:18:28 -0000 1.33 --- sqMacWindow.c 22 Sep 2004 18:54:30 -0000 1.34 *************** *** 83,105 **** int ioSetFullScreen(int fullScreen) { #endif ! Rect screen,portRect,ignore; int width, height, maxWidth, maxHeight; int oldWidth, oldHeight; ! static Rect rememberOldLocation = {44,8,0,0}; GDHandle dominantGDevice; ! #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&dominantGDevice,&ignore); if (dominantGDevice == null) { success(false); return 0; } screen = (**dominantGDevice).gdRect; #else - dominantGDevice = getDominateDevice(getSTWindow(),&ignore); - if (dominantGDevice == null) { - success(false); - return 0; - } getDominateGDeviceRect(dominantGDevice,&screen,true); #endif --- 83,101 ---- int ioSetFullScreen(int fullScreen) { #endif ! Rect screen,portRect; int width, height, maxWidth, maxHeight; int oldWidth, oldHeight; ! static Rect rememberOldLocation = {0,0,0,0}; GDHandle dominantGDevice; ! dominantGDevice = getThatDominateGDevice(); if (dominantGDevice == null) { success(false); return 0; } + + #if TARGET_API_MAC_CARBON screen = (**dominantGDevice).gdRect; #else getDominateGDeviceRect(dominantGDevice,&screen,true); #endif *************** *** 107,110 **** --- 103,110 ---- if (fullScreen) { GetPortBounds(GetWindowPort(getSTWindow()),&rememberOldLocation); + if (gWindowsIsInvisible) { + rememberOldLocation.top = 44; + rememberOldLocation.left = 8; + } LocalToGlobal((Point*) &rememberOldLocation.top); LocalToGlobal((Point*) &rememberOldLocation.bottom); *************** *** 115,122 **** width = screen.right - screen.left; height = (screen.bottom - screen.top); - if ((oldWidth < width) || (oldHeight < height)) { - /* save old size if it wasn't already full-screen */ - setSavedWindowSize((oldWidth << 16) + (oldHeight & 0xFFFF)); - } MoveWindow(getSTWindow(), screen.left, screen.top, true); SizeWindow(getSTWindow(), width, height, true); --- 115,118 ---- *************** *** 125,135 **** MenuBarRestore(); ! /* get old window size */ ! width = (unsigned) getSavedWindowSize() >> 16; ! height = getSavedWindowSize() & 0xFFFF; ! /* minimum size is 64 x 64 */ ! width = (width > 64) ? width : 64; ! height = (height > 64) ? height : 64; /* maximum size is screen size inset slightly */ --- 121,132 ---- MenuBarRestore(); ! if (EmptyRect(&rememberOldLocation)) { ! /* get old window size */ ! width = (unsigned) getSavedWindowSize() >> 16; ! height = getSavedWindowSize() & 0xFFFF; ! /* minimum size is 1 x 1 */ ! width = (width > 0) ? width : 64; ! height = (height > 0) ? height : 64; /* maximum size is screen size inset slightly */ *************** *** 138,143 **** width = (width <= maxWidth) ? width : maxWidth; height = (height <= maxHeight) ? height : maxHeight; MoveWindow(getSTWindow(), rememberOldLocation.left, rememberOldLocation.top, true); ! SizeWindow(getSTWindow(), width, height, true); setFullScreenFlag(false); } --- 135,145 ---- width = (width <= maxWidth) ? width : maxWidth; height = (height <= maxHeight) ? height : maxHeight; + MoveWindow(getSTWindow(), 8, 44, true); + SizeWindow(getSTWindow(), width, height, true); + } else { MoveWindow(getSTWindow(), rememberOldLocation.left, rememberOldLocation.top, true); ! SizeWindow(getSTWindow(), rememberOldLocation.right - rememberOldLocation.left, rememberOldLocation.bottom - rememberOldLocation.top, true); ! } ! setFullScreenFlag(false); } *************** *** 561,565 **** void SetUpWindow(void) { ! Rect windowBounds = {44, 8, 300, 500}; #ifndef IHAVENOHEAD --- 563,575 ---- void SetUpWindow(void) { ! Rect windowBounds = {44, 8, 0, 0}; ! int width,height; ! ! /* get old window size */ ! width = (unsigned) getSavedWindowSize() >> 16; ! height = getSavedWindowSize() & 0xFFFF; ! ! windowBounds.bottom = windowBounds.top+height; ! windowBounds.right = windowBounds.left+width; #ifndef IHAVENOHEAD *************** *** 611,622 **** int ioScreenDepth(void) { - Rect ignore; GDHandle mainDevice; ! #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&mainDevice,&ignore); ! #else ! mainDevice = getDominateDevice(getSTWindow(),&ignore); ! #endif if (mainDevice == null) --- 621,627 ---- int ioScreenDepth(void) { GDHandle mainDevice; ! mainDevice = getThatDominateGDevice(); if (mainDevice == null) *************** *** 749,753 **** GDHandle dominantGDevice; - Rect ignore; Handle displayState; UInt32 depthMode=depth; --- 754,757 ---- *************** *** 769,777 **** } ! #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&dominantGDevice,&ignore); ! #else ! dominantGDevice = getDominateDevice(getSTWindow(),&ignore); ! #endif if (dominantGDevice == null) { success(false); --- 773,777 ---- } ! dominantGDevice = getThatDominateGDevice(); if (dominantGDevice == null) { success(false); *************** *** 812,815 **** --- 812,826 ---- } + GDHandle getThatDominateGDevice() { + GDHandle dominantGDevice; + Rect ignore; + #if TARGET_API_MAC_CARBON + GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&dominantGDevice,&ignore); + #else + dominantGDevice = getDominateDevice(getSTWindow(),&ignore); + #endif + return dominantGDevice; + } + #if !I_AM_CARBON_EVENT || defined(BROWSERPLUGIN) |
|
From: John M M. <jo...@us...> - 2004-09-22 18:53:25
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6715/squeak/platforms/Mac OS/vm Modified Files: sqMacUIMenuBar.c Log Message: 3.7.5b3 Only hide the menu bar if the full screen squeak window is on the primary screen Index: sqMacUIMenuBar.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacUIMenuBar.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sqMacUIMenuBar.c 2 Sep 2003 17:53:37 -0000 1.5 --- sqMacUIMenuBar.c 22 Sep 2004 18:53:17 -0000 1.6 *************** *** 36,39 **** --- 36,40 ---- void MenuBarHide(void) { if (menuBarRegion != nil) return; /* saved state, so menu bar is already hidden */ + if (!(getThatDominateGDevice() == GetMainDevice())) return; /*Do not did if main window on secondary screen */ menuBarRegion = (RgnHandle) 1; ShowMenuBar(); |
|
From: John M M. <jo...@us...> - 2004-09-22 18:52:17
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6451/squeak/platforms/Mac OS/vm Modified Files: sqMacMain.c Log Message: 3.7.5b3 Change when window opens so we can correct window size and full screen open logic on multiple screens Index: sqMacMain.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacMain.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** sqMacMain.c 3 Aug 2004 02:40:39 -0000 1.21 --- sqMacMain.c 22 Sep 2004 18:52:05 -0000 1.22 *************** *** 176,180 **** SetUpClipboard(); fetchPrefrences(); - SetUpWindow(); #ifndef I_AM_CARBON_EVENT --- 176,179 ---- *************** *** 253,256 **** --- 252,256 ---- readImageFromFileHeapSizeStartingAt(f, sqGetAvailableMemory(), calculateStartLocationForImage()); sqImageFileClose(f); + SetUpWindow(); #ifndef MINIMALVM |
|
From: John M M. <jo...@us...> - 2004-09-22 18:51:20
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6268/squeak/platforms/Mac OS/vm/Documentation Modified Files: 3.7.5 Release Notes.rtf Log Message: 3.7.5b3 Comments about changes Index: 3.7.5 Release Notes.rtf =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Documentation/3.7.5 Release Notes.rtf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 3.7.5 Release Notes.rtf 2 Sep 2004 23:07:24 -0000 1.1 --- 3.7.5 Release Notes.rtf 22 Sep 2004 18:51:09 -0000 1.2 *************** *** 7,11 **** \f0\fs24 \cf0 Mac VM 3.7.5 mach-o build for Carbon, and build for Classic. Support for Croquet, support for Safari, pending support for TK4\ ! Aug 31th, 2004 (3.7.5b1)\ \ Still yet to do, in future versions -> Verify that file delete rename etc works on aliases, not the targets. (Yawn, someday)\ --- 7,11 ---- \f0\fs24 \cf0 Mac VM 3.7.5 mach-o build for Carbon, and build for Classic. Support for Croquet, support for Safari, pending support for TK4\ ! Aug 31th, 2004 (3.7.5b3)\ \ Still yet to do, in future versions -> Verify that file delete rename etc works on aliases, not the targets. (Yawn, someday)\ *************** *** 15,18 **** --- 15,29 ---- 3.7.4 seems a fine VM, from what people tell me, but now we've 3.7.5...\ \ + 3.7.5b3 OpenGL fix by Bert.\ + Open Squeak3D.log in the currently directory, not the root volume, also ensured this works in os9.\ + \ + sqMacNSPlugin.c Alter memory check at startup to ensure we see all 512MB, not a default of 30MB\ + sqMacUIMenuBar.c Don't hide menubar if squeak screen is full screen on secondary screen. \ + sqMacWindow.c When you open in full screen mode, then revert, ensure the screen is resized rationally. \ + Also remember screen size and location when going into full screen so revert is sane. \ + \ + 3.7.5b2 Limited distribution for testing\ + 3.7.5b1 Limited distribution for testing \ + \ 3.7.5b1 Released to fix issues with 16bit to 32bit display color mapping\ \ *************** *** 86,91 **** \f2\fs20 \CocoaLigature0 \ \cf2 "ShiftJIS"\cf0 kCFStringEncodingShiftJIS\ ! \f1\fs24 \CocoaLigature1 \ sqMacFileLogic.c Alter makeFSSpec(), get kCFStringNormalizationFormD path name\ Alter PathToFile(), get kCFStringNormalizationFormKC path name\ --- 97,103 ---- \f2\fs20 \CocoaLigature0 \ \cf2 "ShiftJIS"\cf0 kCFStringEncodingShiftJIS\ + \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural ! \f1\fs24 \cf0 \CocoaLigature1 \ sqMacFileLogic.c Alter makeFSSpec(), get kCFStringNormalizationFormD path name\ Alter PathToFile(), get kCFStringNormalizationFormKC path name\ *************** *** 129,137 **** Broke high bit ascii macroman in 3.7.0bx.\ For multi-byte character input you get EventKeyDown/EventKeyChar/EventKeyUp for each unicode character coming from the input sequence.\ ! \f0 \ 3.7.0b2 \ ! \f1 a) You can alter the application's Info.plist by setting the SqueakEncodingType using the ICANA readable names\ \ macintosh - >macRoman \ --- 141,151 ---- Broke high bit ascii macroman in 3.7.0bx.\ For multi-byte character input you get EventKeyDown/EventKeyChar/EventKeyUp for each unicode character coming from the input sequence.\ + \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural ! \f0 \cf0 \ 3.7.0b2 \ + \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural ! \f1 \cf0 a) You can alter the application's Info.plist by setting the SqueakEncodingType using the ICANA readable names\ \ macintosh - >macRoman \ *************** *** 141,152 **** c) Usage of VMMaker3-7a2.\ d) Special change sets: make primitive point x/y internal, and slightly faster activate.\ ! \f0 \ 3.7.0b1 \ ! \f1 Changes for the "m17n" package fromTetsuya HAYASHI <{\field{\*\fldinst{HYPERLINK "mailto:te...@st..."}}{\fldrslt te...@st...}}> so one can type Kanji characters.\ \ ! \f0 3.6.1b7 \ SqMacWindow.c Fix for new rending code when used with 2.8 or earlier images, mouse clicks reported in wrong place\ \ --- 155,169 ---- c) Usage of VMMaker3-7a2.\ d) Special change sets: make primitive point x/y internal, and slightly faster activate.\ + \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural ! \f0 \cf0 \ 3.7.0b1 \ + \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural ! \f1 \cf0 Changes for the "m17n" package fromTetsuya HAYASHI <{\field{\*\fldinst{HYPERLINK "mailto:te...@st..."}}{\fldrslt te...@st...}}> so one can type Kanji characters.\ \ + \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural ! \f0 \cf0 3.6.1b7 \ SqMacWindow.c Fix for new rending code when used with 2.8 or earlier images, mouse clicks reported in wrong place\ \ |
|
From: Ned K. <ne...@us...> - 2004-09-15 23:13:13
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9433 Modified Files: Tag: ned-branch Makefile.mingw.gcc33 Log Message: More tinkering with build flags Index: Makefile.mingw.gcc33 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Attic/Makefile.mingw.gcc33,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Makefile.mingw.gcc33 16 Jul 2004 17:35:57 -0000 1.1.2.2 --- Makefile.mingw.gcc33 15 Sep 2004 23:13:04 -0000 1.1.2.3 *************** *** 22,26 **** # - # SRCDIR can be set automatically if the current directory is either the # platforms/win32/misc or the platforms/win32 directory --- 22,25 ---- *************** *** 110,114 **** LIBSRC = $(wildcard *.c) ! LIBOBJ = $(LIBSRC:.c=.o) # LIBOBJ = $(addprefix $(OBJDIR)/,$(LIBOBJ)) --- 109,113 ---- LIBSRC = $(wildcard *.c) ! LIBOBJ ?= $(LIBSRC:.c=.o) # LIBOBJ = $(addprefix $(OBJDIR)/,$(LIBOBJ)) *************** *** 151,163 **** # 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) ############################################################################# --- 150,170 ---- # And where to look for files? # ! vpath %.c $(VMDIR);$(VMOUTDIR) ! vpath %.h $(VMDIR);$(VMOUTDIR) ! ! vpath %.o $(VMOUTDIR) ! vpath %.dll $(BLDDIR) ! ! vpath %.def $(VMOUTDIR) ! vpath %.exp $(VMOUTDIR) ! vpath %.lib $(VMOUTDIR) ! vpath %.res $(VMOUTDIR) vpath Mpeg%.o $(VMOUTDIR) vpath $(VM) $(VMOUTDIR) vpath plugins.% $(SRCDIR)/plugins + vpath sqNamedPrims.% $(VMDIR) + vpath gnu-interp.* $(BLDDIR) ############################################################################# *************** *** 167,188 **** 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 ############################################################################# --- 174,200 ---- CXX= g++ ! DEFS ?= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DLSB_FIRST -DX86 -DHAVE_LSTAT=0 $(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) ! # OPTFLAGS ?= -O3 -fleading-underscore -msse -mmmx -minline-all-stringops ! # OPTFLAGS ?= -O3 -fleading-underscore ! OPTFLAGS ?= -O2 ! CFLAGS ?= -ggdb3 -mwindows -mwin32 -mno-cygwin $(WFLAGS) $(OPTFLAGS) ! INTERPCFLAGS?= -fno-gcse ! CXXFLAGS?= $(CFLAGS) -felide-constructors ############################################################################# *************** *** 194,204 **** # 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) ############################################################################# --- 206,216 ---- # LD= ld LD= gcc DXLIBS= -ldxguid -lddraw -ldinput STDLIBS= -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm -luser32 -lgdi32 -lkernel32 CRTLIB = -lcrtdll ! # LDFLAGS= -mwindows -ggdb3 -L$(DXLIBDIR) -L$(GNULIBDIR) ! LDFLAGS= -ggdb3 -L$(DXLIBDIR) -L$(GNULIBDIR) ! LIBS= $(DXLIBS) $(STDLIBS) $(CRTLIB) ! ############################################################################# *************** *** 253,256 **** --- 265,270 ---- # Building plugins + -include pMakefile.win32 + DLL: $(DLLOBJ) *************** *** 269,296 **** -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 --- 283,307 ---- -def $(OBJDIR)/$(LIB).def \ -o $(OBJDIR)/$(LIB).dll \ $(OBJDIR)/$(LIB).exp \ ! $(LIBOBJ) \ ! $(LIBS) ! ! # -$(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) LIB=$(BLDDIR)/$@ XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib %.dll: ! $(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) LIB=$* XDEFS=-DNO_SQUEAK_BUILTIN_PLUGIN makedll *************** *** 337,341 **** gnu-interp.c: interp.c $(MISCDIR)/gnuify ! gnu-interp.o: CFLAGS+=$(INTERPCFLAGS) Mpeg3Plugin.o: Mpeg3Plugin.c --- 348,352 ---- gnu-interp.c: interp.c $(MISCDIR)/gnuify ! gnu-interp.o: CFLAGS?=$(INTERPCFLAGS) Mpeg3Plugin.o: Mpeg3Plugin.c *************** *** 344,347 **** --- 355,359 ---- $(RC) $(RCFLAGS) -i $< -o $@ + ############################################################################# # sync-ing sqNamedPrims.h with plugins.int *************** *** 357,361 **** .PHONY: clean clean: ! -$(RM) -f $(VM) $(EXTERNAL_LIBS) $(ALLOBJ) tags: --- 369,376 ---- .PHONY: clean clean: ! -$(RM) -f $(VM) $(EXTERNAL_LIBS) $(INTERNAL_LIBS) $(LIBOBJ) $(DLLOBJ) $(ALLOBJ) $(DLLDIR)/*/*.o Squeak.* *.o gnu-interp.* $(DLLDIR)/*/*.lib ! ! realclean: clean ! -$(RM) -f tags: |
|
From: John M M. <jo...@us...> - 2004-09-03 00:20:28
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32651/squeak/platforms/Mac OS/vm Modified Files: sqMacExternalPrims.c Log Message: 3.7.5b1 Search for frameworks in all framework domains, versus just System. Also search by posix pathname versus HFS pathname Index: sqMacExternalPrims.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacExternalPrims.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sqMacExternalPrims.c 3 Aug 2004 02:39:59 -0000 1.7 --- sqMacExternalPrims.c 3 Sep 2004 00:20:19 -0000 1.8 *************** *** 13,16 **** --- 13,17 ---- * Oct 2nd, 2003, JMM bug in browser file name creation in os-x, rework how path is resolved 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding + 3.7.5b1 Aug 24th, 2004 JMM Joliet support for loading bundles? *****************************************************************************/ *************** *** 122,126 **** #if defined ( __APPLE__ ) && defined ( __MACH__ ) ! OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) { OSStatus err; --- 123,127 ---- #if defined ( __APPLE__ ) && defined ( __MACH__ ) ! OSStatus LoadFrameworkBundle(SInt16 folderLocation,CFStringRef framework, CFBundleRef *bundlePtr) { OSStatus err; *************** *** 134,138 **** bundleURL = nil; ! err = FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, true, &frameworksFolderRef); if (err == noErr) { baseURL = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &frameworksFolderRef); --- 135,139 ---- bundleURL = nil; ! err = FSFindFolder(folderLocation, kFrameworksFolderType, true, &frameworksFolderRef); if (err == noErr) { baseURL = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &frameworksFolderRef); *************** *** 205,212 **** CFragConnectionID LoadLibViaPath(char *libName, char *pluginDirPath) { char tempDirPath[1024]; ! CFragConnectionID libHandle = 0; CFURLRef theURLRef; CFBundleRef theBundle; - CFStringRef filePath; OSStatus err; --- 206,214 ---- CFragConnectionID LoadLibViaPath(char *libName, char *pluginDirPath) { char tempDirPath[1024]; ! char cFileName[1000]; ! CFragConnectionID libHandle = 0; ! CFStringRef filePath; CFURLRef theURLRef; CFBundleRef theBundle; OSStatus err; *************** *** 221,232 **** strcat(tempDirPath,".bundle"); //Watch out for the bundle suffix, not a normal thing in squeak plugins ! // We could do this, but it's expensive err =makeFSSpec(tempDirPath,strlen(tempDirPath),&fileSpec); ! // So go back to a cheaper call ! filePath = CFStringCreateWithCString(kCFAllocatorDefault, ! (UInt8 *) tempDirPath,gCurrentVMEncoding); ! if (filePath == nil) ! return nil; ! ! theURLRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,filePath,kCFURLHFSPathStyle,false); CFRelease(filePath); if (theURLRef == nil) --- 223,232 ---- strcat(tempDirPath,".bundle"); //Watch out for the bundle suffix, not a normal thing in squeak plugins ! ! /* copy the file name into a null-terminated C string */ ! sqFilenameFromString(cFileName, tempDirPath, strlen(tempDirPath)); ! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),gCurrentVMEncoding,false); ! ! theURLRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,filePath,kCFURLPOSIXPathStyle,false); CFRelease(filePath); if (theURLRef == nil) *************** *** 239,243 **** CFStringRef libNameCFString; libNameCFString = CFStringCreateWithCString(kCFAllocatorDefault,libName,gCurrentVMEncoding); ! err = LoadFrameworkBundle(libNameCFString, &theBundle); CFRelease(libNameCFString); if (err != noErr) --- 239,250 ---- CFStringRef libNameCFString; libNameCFString = CFStringCreateWithCString(kCFAllocatorDefault,libName,gCurrentVMEncoding); ! err = LoadFrameworkBundle(kUserDomain,libNameCFString, &theBundle); ! if (err != noErr) ! err = LoadFrameworkBundle(kNetworkDomain,libNameCFString, &theBundle); ! if (err != noErr) ! err = LoadFrameworkBundle(kLocalDomain,libNameCFString, &theBundle); ! if (err != noErr) ! err = LoadFrameworkBundle(kSystemDomain,libNameCFString, &theBundle); ! CFRelease(libNameCFString); if (err != noErr) |
|
From: John M M. <jo...@us...> - 2004-09-03 00:19:56
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32461/squeak/platforms/Mac OS/vm Modified Files: sqMacFileLogic.c Log Message: 3.7.5b1 Cleanup some compiler warning messages Index: sqMacFileLogic.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacFileLogic.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** sqMacFileLogic.c 3 Aug 2004 02:40:08 -0000 1.14 --- sqMacFileLogic.c 3 Sep 2004 00:19:45 -0000 1.15 *************** *** 258,262 **** Boolean isFolder=false,isAlias=false; CFURLRef sillyThing,appendedSillyThing; ! CFStringRef lastPartOfPath; CFMutableStringRef filePath; --- 258,262 ---- Boolean isFolder=false,isAlias=false; CFURLRef sillyThing,appendedSillyThing; ! CFStringRef lastPartOfPath,filePath2; CFMutableStringRef filePath; *************** *** 296,308 **** appendedSillyThing = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,sillyThing,lastPartOfPath,false); #if defined(__MWERKS__) && !defined(__APPLE__) && !defined(__MACH__) ! filePath = CFURLCopyFileSystemPath (appendedSillyThing, kCFURLHFSPathStyle); #else ! filePath = CFURLCopyFileSystemPath (appendedSillyThing, kCFURLPOSIXPathStyle); #endif ! CFStringGetCString (filePath,dst,1000, gCurrentVMEncoding); CFRelease(sillyThing); CFRelease(appendedSillyThing); CFRelease(lastPartOfPath); ! CFRelease(filePath); return; } --- 296,308 ---- appendedSillyThing = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,sillyThing,lastPartOfPath,false); #if defined(__MWERKS__) && !defined(__APPLE__) && !defined(__MACH__) ! filePath2 = CFURLCopyFileSystemPath (appendedSillyThing, kCFURLHFSPathStyle); #else ! filePath2 = CFURLCopyFileSystemPath (appendedSillyThing, kCFURLPOSIXPathStyle); #endif ! CFStringGetCString (filePath2,dst,1000, gCurrentVMEncoding); CFRelease(sillyThing); CFRelease(appendedSillyThing); CFRelease(lastPartOfPath); ! CFRelease(filePath2); return; } |
|
From: John M M. <jo...@us...> - 2004-09-03 00:19:28
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32388/squeak/platforms/Mac OS/vm Modified Files: sqMacUIEvents.c Log Message: 3.7.5b1 Swallow bring to front clicks for os-x and os-9 Index: sqMacUIEvents.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacUIEvents.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** sqMacUIEvents.c 3 Aug 2004 02:42:18 -0000 1.23 --- sqMacUIEvents.c 3 Sep 2004 00:19:18 -0000 1.24 *************** *** 25,30 **** * 3.7.1b3 Jan 29th, 2004 JMM return unicode for classic version versus virtual keyboard code * 3.7.3b2 Apr 10th, 2004 JMM Tetsuya HAYASHI <te...@st...> alteration to unicode key capture ! notes: see incontent, I think it's a bug, click to bring to foreground signls mousedown. bad... ! IsUserCancelEventRef *****************************************************************************/ --- 25,29 ---- * 3.7.1b3 Jan 29th, 2004 JMM return unicode for classic version versus virtual keyboard code * 3.7.3b2 Apr 10th, 2004 JMM Tetsuya HAYASHI <te...@st...> alteration to unicode key capture ! notes: IsUserCancelEventRef *****************************************************************************/ *************** *** 165,173 **** void HandleMouseDown(EventRecord *theEvent); int ioProcessEvents(void) { - #ifndef BROWSERPLUGIN /* This is a noop when running as a plugin; the browser handles events. */ static unsigned long nextPollTick = 0, nextPowerCheck=0, disableIdleTickLimit=0; unsigned long clockTime; clockTime = ioLowResMSecs(); if (abs(nextPollTick - clockTime) >= 16) { --- 164,172 ---- void HandleMouseDown(EventRecord *theEvent); int ioProcessEvents(void) { /* This is a noop when running as a plugin; the browser handles events. */ static unsigned long nextPollTick = 0, nextPowerCheck=0, disableIdleTickLimit=0; unsigned long clockTime; + #ifndef BROWSERPLUGIN clockTime = ioLowResMSecs(); if (abs(nextPollTick - clockTime) >= 16) { *************** *** 356,377 **** #ifndef IHAVENOHEAD case inDrag: - if (getFullScreenFlag()) break; GetRegionBounds(GetGrayRgn(), &dragBounds); ! if (theWindow == getSTWindow()) { ! DragWindow(getSTWindow(), theEvent->where, &dragBounds); ! } break; case inGrow: ! if (theWindow == getSTWindow()) { ! if (getFullScreenFlag()) ! break; ! newSize = GrowWindow(getSTWindow(), theEvent->where, &growLimits); if (newSize != 0) { ! SizeWindow(getSTWindow(), LoWord(newSize), HiWord(newSize), true); ! } } break; --- 355,372 ---- #ifndef IHAVENOHEAD case inDrag: if (getFullScreenFlag()) break; GetRegionBounds(GetGrayRgn(), &dragBounds); ! DragWindow( theWindow, theEvent->where, &dragBounds); break; case inGrow: ! if (getFullScreenFlag()) ! break; ! ! newSize = GrowWindow(theWindow, theEvent->where, &growLimits); if (newSize != 0) { ! SizeWindow( theWindow, LoWord(newSize), HiWord(newSize), true); } break; *************** *** 379,388 **** case inZoomIn: case inZoomOut: ! if (theWindow == getSTWindow()) { ! if (getFullScreenFlag()) ! break; ! DoZoomWindow(theEvent,getSTWindow(), windowCode,10000, 10000); ! } ! break; --- 374,381 ---- case inZoomIn: case inZoomOut: ! if (getFullScreenFlag()) ! break; ! ! DoZoomWindow(theEvent, theWindow, windowCode,10000, 10000); break; *************** *** 390,396 **** gButtonIsDown = true; if (theWindow == getSTWindow()) { - if (theWindow != FrontWindow()) { - SelectWindow(getSTWindow()); - } if(inputSemaphoreIndex) { recordMouseEvent(theEvent,MouseModifierState(theEvent)); --- 383,386 ---- *************** *** 398,409 **** } recordMouseDown(theEvent); } break; case inGoAway: - if ((theWindow == getSTWindow()) && - (TrackGoAway(getSTWindow(), theEvent->where))) { - /* HideWindow(stWindow); noop for now */ - } break; #endif --- 388,397 ---- } recordMouseDown(theEvent); + } else { + SelectWindow(theWindow); } break; case inGoAway: break; #endif *************** *** 1214,1222 **** { kEventClassWindow, kEventWindowDeactivated}}; ! EventTypeSpec windEventMouseList[] = {{ kEventClassMouse, kEventMouseMoved}, { kEventClassMouse, kEventMouseWheelMoved}, { kEventClassMouse, kEventMouseDragged}, { kEventClassMouse, kEventMouseUp}, ! { kEventClassMouse, kEventMouseDown}}; EventTypeSpec windEventKBList[] = {{ kEventClassKeyboard, kEventRawKeyDown}, --- 1202,1212 ---- { kEventClassWindow, kEventWindowDeactivated}}; ! EventTypeSpec windEventMouseList[] = { ! { kEventClassMouse, kEventMouseMoved}, { kEventClassMouse, kEventMouseWheelMoved}, { kEventClassMouse, kEventMouseDragged}, { kEventClassMouse, kEventMouseUp}, ! { kEventClassMouse, kEventMouseDown} ! }; EventTypeSpec windEventKBList[] = {{ kEventClassKeyboard, kEventRawKeyDown}, *************** *** 1456,1464 **** OSStatus result = eventNotHandledErr; /* report failure by default */ static RgnHandle ioWinRgn=null; extern Boolean gSqueakWindowIsFloating,gSqueakFloatingWindowGetsFocus; ! if (!windowActive) ! return result; if (ioWinRgn == null) ioWinRgn = NewRgn(); --- 1446,1462 ---- OSStatus result = eventNotHandledErr; /* report failure by default */ static RgnHandle ioWinRgn=null; + static Boolean mouseDownActivate=false; extern Boolean gSqueakWindowIsFloating,gSqueakFloatingWindowGetsFocus; ! whatHappened = GetEventKind(event); ! + //fprintf(stderr,"\nMouseEvent %i-%i ",whatHappened,windowActive); + + if (!windowActive) { + if (whatHappened == kEventMouseDown) + mouseDownActivate = true; + return result; + } if (ioWinRgn == null) ioWinRgn = NewRgn(); *************** *** 1468,1471 **** --- 1466,1471 ---- if (!PtInRgn(mouseLocation,ioWinRgn)) { + if (mouseDownActivate && whatHappened == kEventMouseUp) + mouseDownActivate = false; return result; } *************** *** 1479,1483 **** return result; ! whatHappened = GetEventKind(event); switch (whatHappened) { --- 1479,1483 ---- return result; ! switch (whatHappened) { *************** *** 1485,1488 **** --- 1485,1490 ---- case kEventMouseDragged: case kEventMouseWheelMoved: + if (mouseDownActivate) + return result; recordMouseEventCarbon(event,whatHappened); result = noErr; *************** *** 1492,1495 **** --- 1494,1499 ---- if (PtInRgn(mouseLocation,ioWinRgn)) return result; + if (mouseDownActivate) + return result; if (gSqueakFloatingWindowGetsFocus && gSqueakWindowIsFloating) { SetUserFocusWindow(kUserFocusAuto); *************** *** 1501,1504 **** --- 1505,1512 ---- break; case kEventMouseUp: + if (mouseDownActivate) { + mouseDownActivate = false; + return result; + } gButtonIsDown = false; recordMouseEventCarbon(event,whatHappened); *************** *** 1512,1515 **** --- 1520,1524 ---- if (postMessageHook) doPostMessageHook(event); + //fprintf(stderr,"handled %i",result); return result; } *************** *** 1518,1522 **** EventRef event, void* userData) { ! UInt32 whatHappened,keyCode,key; OSStatus result = eventNotHandledErr; /* report failure by default */ --- 1527,1532 ---- EventRef event, void* userData) { ! UInt32 whatHappened,keyCode; ! SInt32 key; OSStatus result = eventNotHandledErr; /* report failure by default */ *************** *** 1544,1548 **** //fprintf(stdout,"\nrawkey up %i",ioMSecs()); key = findInKeyMap(keyCode); ! if (key) { enterKeystroke ( EventTypeKeyboard,key, EventKeyUp, ModifierStateCarbon(event,0)); } --- 1554,1558 ---- //fprintf(stdout,"\nrawkey up %i",ioMSecs()); key = findInKeyMap(keyCode); ! if (key != -1) { enterKeystroke ( EventTypeKeyboard,key, EventKeyUp, ModifierStateCarbon(event,0)); } *************** *** 1579,1582 **** --- 1589,1593 ---- if (!windowActive) return result; + if(messageHook && ((result = doPreMessageHook(event)) != eventNotHandledErr)) return result; *************** *** 2045,2049 **** { int idx= indexInKeyMap(keyCode); ! return (idx >= 0) ? keyMap[idx].keyChar : -1; } --- 2056,2060 ---- { int idx= indexInKeyMap(keyCode); ! return (idx != -1) ? keyMap[idx].keyChar : -1; } *************** *** 2051,2055 **** { int idx= indexInKeyMap(keyCode); ! return (idx >= 0) ? keyMap[idx].keyRepeated : 0; } --- 2062,2066 ---- { int idx= indexInKeyMap(keyCode); ! return (idx != -1) ? keyMap[idx].keyRepeated : 0; } *************** *** 2057,2061 **** { int idx= indexInKeyMap(keyCode); ! if (idx >= 0) keyMap[idx].keyRepeated = 1; } --- 2068,2072 ---- { int idx= indexInKeyMap(keyCode); ! if (idx != -1) keyMap[idx].keyRepeated = 1; } *************** *** 2065,2069 **** int keyChar= -1; //fprintf(stdout, "\nremoveFromKeyMap T %i c %i i %i",ioMSecs(),keyCode,keyMapSize-1); ! if (idx < 0) { fprintf(stderr, "keymap underflow\n"); return -1; } keyChar= keyMap[idx].keyChar; for (; idx < keyMapSize - 1; ++idx) --- 2076,2080 ---- int keyChar= -1; //fprintf(stdout, "\nremoveFromKeyMap T %i c %i i %i",ioMSecs(),keyCode,keyMapSize-1); ! if (idx == -1) { fprintf(stderr, "keymap underflow\n"); return -1; } keyChar= keyMap[idx].keyChar; for (; idx < keyMapSize - 1; ++idx) |
|
From: John M M. <jo...@us...> - 2004-09-03 00:18:38
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32204/squeak/platforms/Mac OS/vm Modified Files: sqMacWindow.c Log Message: 3.7.5b1 Use getSTWindow(), use better 16->32bit conversion algoritm Index: sqMacWindow.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** sqMacWindow.c 3 Aug 2004 02:42:35 -0000 1.32 --- sqMacWindow.c 3 Sep 2004 00:18:28 -0000 1.33 *************** *** 31,34 **** --- 31,35 ---- #include "sqmacUIEvents.h" #include "sqMacUIMenuBar.h" + #include "sqMacEncoding.h" *************** *** 38,41 **** --- 39,43 ---- extern int getSavedWindowSize(); /* set from header when image file is loaded */ extern int setSavedWindowSize(int value); /* set from header when image file is loaded */ + extern struct VirtualMachine *interpreterProxy; /*** Variables -- Mac Related ***/ *************** *** 88,92 **** #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(stWindow,kWindowContentRgn,&dominantGDevice,&ignore); if (dominantGDevice == null) { success(false); --- 90,94 ---- #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&dominantGDevice,&ignore); if (dominantGDevice == null) { success(false); *************** *** 95,99 **** screen = (**dominantGDevice).gdRect; #else ! dominantGDevice = getDominateDevice(stWindow,&ignore); if (dominantGDevice == null) { success(false); --- 97,101 ---- screen = (**dominantGDevice).gdRect; #else ! dominantGDevice = getDominateDevice(getSTWindow(),&ignore); if (dominantGDevice == null) { success(false); *************** *** 104,112 **** if (fullScreen) { ! GetPortBounds(GetWindowPort(stWindow),&rememberOldLocation); LocalToGlobal((Point*) &rememberOldLocation.top); LocalToGlobal((Point*) &rememberOldLocation.bottom); MenuBarHide(); ! GetPortBounds(GetWindowPort(stWindow),&portRect); oldWidth = portRect.right - portRect.left; oldHeight = portRect.bottom - portRect.top; --- 106,114 ---- if (fullScreen) { ! GetPortBounds(GetWindowPort(getSTWindow()),&rememberOldLocation); LocalToGlobal((Point*) &rememberOldLocation.top); LocalToGlobal((Point*) &rememberOldLocation.bottom); MenuBarHide(); ! GetPortBounds(GetWindowPort(getSTWindow()),&portRect); oldWidth = portRect.right - portRect.left; oldHeight = portRect.bottom - portRect.top; *************** *** 117,122 **** setSavedWindowSize((oldWidth << 16) + (oldHeight & 0xFFFF)); } ! MoveWindow(stWindow, screen.left, screen.top, true); ! SizeWindow(stWindow, width, height, true); setFullScreenFlag(true); } else { --- 119,124 ---- setSavedWindowSize((oldWidth << 16) + (oldHeight & 0xFFFF)); } ! MoveWindow(getSTWindow(), screen.left, screen.top, true); ! SizeWindow(getSTWindow(), width, height, true); setFullScreenFlag(true); } else { *************** *** 136,141 **** width = (width <= maxWidth) ? width : maxWidth; height = (height <= maxHeight) ? height : maxHeight; ! MoveWindow(stWindow, rememberOldLocation.left, rememberOldLocation.top, true); ! SizeWindow(stWindow, width, height, true); setFullScreenFlag(false); } --- 138,143 ---- width = (width <= maxWidth) ? width : maxWidth; height = (height <= maxHeight) ? height : maxHeight; ! MoveWindow(getSTWindow(), rememberOldLocation.left, rememberOldLocation.top, true); ! SizeWindow(getSTWindow(), width, height, true); setFullScreenFlag(false); } *************** *** 310,313 **** --- 312,334 ---- } } else if ( depth == 16 && pixDepth == 32) { + //(2r0 to: 2r11111000 by: 2r1000) collectWithIndex: [:e :i | (e + ((8/32*(i-1)) asInteger)) bitShift: 16] + long lookupTableB[32] = { + 0, 8, 16, 24, 33, 41, 49, 57, + 66, 74, 82, 90, 99, 107, 115, 123, + 132, 140, 148, 156, 165, 173, 181, 189, + 198, 206, 214, 222, 231, 239, 247, 255}; + + long lookupTableG[32] = { + 0, 2048, 4096, 6144, 8448, 10496, 12544, 14592, + 16896, 18944, 20992, 23040, 25344, 27392, 29440, 31488, + 33792, 35840, 37888, 39936, 42240, 44288, 46336, 48384, + 50688, 52736, 54784, 56832, 59136, 61184, 63232, 65280}; + + long lookupTableR[32] = { + 0, 524288, 1048576, 1572864, 2162688, 2686976, 3211264, 3735552, + 4325376, 4849664, 5373952, 5898240, 6488064, 7012352, 7536640, 8060928, + 8650752, 9175040, 9699328, 10223616, 10813440, 11337728, 11862016, 12386304, + 12976128, 13500416, 14024704, 14548992, 15138816, 15663104, 16187392, 16711680}; + while (affectedH--) { register long *to= (long *) out; *************** *** 317,331 **** while (count--) { /* see '11111'b needs to be '11111111'b */ target = *from++; ! r = (target & 0x00007C00); ! g = (target & 0x000003E0); b = (target & 0x0000001F); ! r = (r | (r << 3)) << 6; ! g = (g | (g << 3)) << 3; ! b = b | (b << 3) ; ! *to++ = r | g | b; ! /* *to++ = ((target & 0x00007C00) << 9) | ! ((target & 0x000003E0) << 6) | ! ((target & 0x0000001F) << 3); */ ! } in += pitch; --- 338,348 ---- while (count--) { /* see '11111'b needs to be '11111111'b */ target = *from++; ! r = (target & 0x00007C00) >> 10; ! g = (target & 0x000003E0) >> 5; b = (target & 0x0000001F); ! r = lookupTableR[r]; ! g = lookupTableG[g]; ! b = lookupTableB[b]; ! *to++ = r | g | b ; } in += pitch; *************** *** 567,571 **** CopyCStringToPascal(title,tempTitle); #ifndef IHAVENOHEAD ! SetWTitle(stWindow, tempTitle); #endif } --- 584,588 ---- CopyCStringToPascal(title,tempTitle); #ifndef IHAVENOHEAD ! SetWTitle(getSTWindow(), tempTitle); #endif } *************** *** 598,604 **** #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(stWindow,kWindowContentRgn,&mainDevice,&ignore); #else ! mainDevice = getDominateDevice(stWindow,&ignore); #endif --- 615,621 ---- #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&mainDevice,&ignore); #else ! mainDevice = getDominateDevice(getSTWindow(),&ignore); #endif *************** *** 611,620 **** #ifndef BROWSERPLUGIN int ioScreenSize(void) { ! int w = 10, h = 10; Rect portRect; #ifndef IHAVENOHEAD ! if (stWindow != nil) { ! GetPortBounds(GetWindowPort(stWindow),&portRect); w = portRect.right - portRect.left; h = portRect.bottom - portRect.top; --- 628,640 ---- #ifndef BROWSERPLUGIN int ioScreenSize(void) { ! int w, h; Rect portRect; + w = (unsigned) getSavedWindowSize() >> 16; + h= getSavedWindowSize() & 0xFFFF; + #ifndef IHAVENOHEAD ! if (getSTWindow() != nil) { ! GetPortBounds(GetWindowPort(getSTWindow()),&portRect); w = portRect.right - portRect.left; h = portRect.bottom - portRect.top; *************** *** 627,631 **** int ioSetCursor(int cursorBitsIndex, int offsetX, int offsetY) { /* Old version; forward to new version. */ ! return ioSetCursorWithMask(cursorBitsIndex, nil, offsetX, offsetY); } --- 647,652 ---- int ioSetCursor(int cursorBitsIndex, int offsetX, int offsetY) { /* Old version; forward to new version. */ ! ioSetCursorWithMask(cursorBitsIndex, nil, offsetX, offsetY); ! return 0; } *************** *** 749,755 **** #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(stWindow,kWindowContentRgn,&dominantGDevice,&ignore); #else ! dominantGDevice = getDominateDevice(stWindow,&ignore); #endif if (dominantGDevice == null) { --- 770,776 ---- #if TARGET_API_MAC_CARBON ! GetWindowGreatestAreaDevice(getSTWindow(),kWindowContentRgn,&dominantGDevice,&ignore); #else ! dominantGDevice = getDominateDevice(getSTWindow(),&ignore); #endif if (dominantGDevice == null) { *************** *** 811,815 **** if (TrackBox(theWindow, theEvent->where, zoomDir)) { SetPortWindowPort(theWindow); ! GetPortBounds(GetWindowPort(stWindow),&windRect); EraseRect(&windRect); // recommended for cosmetic reasons --- 832,836 ---- if (TrackBox(theWindow, theEvent->where, zoomDir)) { SetPortWindowPort(theWindow); ! GetPortBounds(GetWindowPort(theWindow),&windRect); EraseRect(&windRect); // recommended for cosmetic reasons *************** *** 979,983 **** pascal void ModeListIterator(void *userData, DMListIndexType itemIndex, DMDisplayModeListEntryPtr displaymodeInfo) { - #pragma unused(itemIndex) unsigned long depthCount; short iCount; --- 1000,1003 ---- *************** *** 1210,1214 **** if (context == NULL) { ! CreateCGContextForPort(GetWindowPort(stWindow), &context); } --- 1230,1234 ---- if (context == NULL) { ! CreateCGContextForPort(GetWindowPort(getSTWindow()), &context); } *************** *** 1279,1283 **** int osxGetSurfaceFormat(int handle, int* width, int* height, int* depth, int* isMSB) { ! CGrafPtr windowPort = GetWindowPort(stWindow); PixMapHandle pix; Rect rectangle; --- 1299,1303 ---- int osxGetSurfaceFormat(int handle, int* width, int* height, int* depth, int* isMSB) { ! CGrafPtr windowPort = GetWindowPort(getSTWindow()); PixMapHandle pix; Rect rectangle; *************** *** 1297,1301 **** static Boolean firstTime=true; static int offsetTitle=0; ! CGrafPtr windowPort = GetWindowPort(stWindow); PixMapHandle pixMap; --- 1317,1321 ---- static Boolean firstTime=true; static int offsetTitle=0; ! CGrafPtr windowPort = GetWindowPort(getSTWindow()); PixMapHandle pixMap; *************** *** 1310,1314 **** rect = NewRgn(); ! GetWindowRegion(stWindow,kWindowTitleBarRgn,rect); GetRegionBounds(rect,&structureRect); offsetTitle = (structureRect.bottom- structureRect.top)* *pitch; --- 1330,1334 ---- rect = NewRgn(); ! GetWindowRegion(getSTWindow(),kWindowTitleBarRgn,rect); GetRegionBounds(rect,&structureRect); offsetTitle = (structureRect.bottom- structureRect.top)* *pitch; *************** *** 1320,1324 **** int osxUnlockSurface(int handle, int x, int y, int w, int h) { ! UnlockPortBits(GetWindowPort(stWindow)); } --- 1340,1344 ---- int osxUnlockSurface(int handle, int x, int y, int w, int h) { ! UnlockPortBits(GetWindowPort(getSTWindow())); } *************** *** 1331,1335 **** SetRectRgn(maskRect, x, y, x+w, y+h); ! QDFlushPortBuffer(GetWindowPort(stWindow), maskRect); } --- 1351,1355 ---- SetRectRgn(maskRect, x, y, x+w, y+h); ! QDFlushPortBuffer(GetWindowPort(getSTWindow()), maskRect); } |
|
From: John M M. <jo...@us...> - 2004-09-03 00:17:48
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32091/squeak/platforms/Mac OS/vm Modified Files: sqPlatformSpecific.h Log Message: 3.7.5b1 Add ftruncate spec to avoid compiler warning Index: sqPlatformSpecific.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqPlatformSpecific.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sqPlatformSpecific.h 7 Jun 2003 00:44:00 -0000 1.13 --- sqPlatformSpecific.h 3 Sep 2004 00:17:38 -0000 1.14 *************** *** 60,63 **** --- 60,64 ---- #define ftell ftello #define fseek fseeko + int ftruncate(int, off_t); typedef FILE *sqImageFile; #else |
|
From: John M M. <jo...@us...> - 2004-09-02 23:11:22
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20695/squeak/platforms/Mac OS/vm/Developer Modified Files: SqueakVMForCarbon.pbproj.sit Log Message: 3.7.5b1 Update Index: SqueakVMForCarbon.pbproj.sit =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/SqueakVMForCarbon.pbproj.sit,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsVSiVT6 and /tmp/cvs9zJ7d2 differ |
|
From: John M M. <jo...@us...> - 2004-09-02 23:11:22
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20510/squeak/platforms/Mac OS/vm/Developer Modified Files: SqueakPro5.xml Log Message: 3.7.5b1 Update Index: SqueakPro5.xml =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/SqueakPro5.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SqueakPro5.xml 10 Apr 2003 00:01:59 -0000 1.6 --- SqueakPro5.xml 2 Sep 2004 23:10:53 -0000 1.7 *************** *** 606,610 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 606,610 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 1949,1959 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>sqMacUIEvents.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>sqMacUIEvents.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 1949,1952 ---- *************** *** 1984,1988 **** <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>interp.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> --- 1977,1981 ---- <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>osExports.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> *************** *** 1991,1995 **** <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>osExports.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> --- 1984,1988 ---- <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>BMPReadWriterPlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> *************** *** 1998,2002 **** <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>BMPReadWriterPlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> --- 1991,1995 ---- <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>GeniePlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> *************** *** 2005,2013 **** <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>GeniePlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> <FILEFLAGS>Debug</FILEFLAGS> </FILE> </FILELIST> <LINKORDER> --- 1998,2027 ---- <FILE> <PATHTYPE>Name</PATHTYPE> ! <PATH>interp os9.c</PATH> ! <PATHFORMAT>MacOS</PATHFORMAT> ! <FILEKIND>Text</FILEKIND> ! <FILEFLAGS>Debug</FILEFLAGS> ! </FILE> ! <FILE> ! <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIEvents.c</PATH> ! <PATHFORMAT>MacOS</PATHFORMAT> ! <FILEKIND>Text</FILEKIND> ! <FILEFLAGS>Debug</FILEFLAGS> ! </FILE> ! <FILE> ! <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacEncoding.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Text</FILEKIND> <FILEFLAGS>Debug</FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 2904,2948 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIEvents.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIEvents.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIMenuBar.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIMenuBar.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>interp.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacWindow.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>osExports.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>BMPReadWriterPlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>GeniePlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> --- 2918,2972 ---- <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIEvents.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIMenuBar.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIMenuBar.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacWindow.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>osExports.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>BMPReadWriterPlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>GeniePlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>interp os9.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacUIEvents.c</PATH> ! <PATHFORMAT>MacOS</PATHFORMAT> ! </FILEREF> ! <FILEREF> ! <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacEncoding.c</PATH> ! <PATHFORMAT>MacOS</PATHFORMAT> ! </FILEREF> ! <FILEREF> ! <PATHTYPE>Name</PATHTYPE> ! <PATH>sqMacEncoding.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> *************** *** 3306,3310 **** <!-- Settings for "Build Extras" panel --> <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING> ! <SETTING><NAME>ActivateBrowser</NAME><VALUE>false</VALUE></SETTING> <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING> <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING> --- 3330,3334 ---- <!-- Settings for "Build Extras" panel --> <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING> ! <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING> <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING> <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING> *************** *** 3506,3510 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 3530,3534 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 3542,3546 **** <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING> ! <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING> --- 3566,3570 ---- <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING> ! <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>1</VALUE></SETTING> <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING> *************** *** 3876,3886 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>sqMacDirectory.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS></FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>sqMacJoystickAndTablet.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 3900,3903 ---- *************** *** 4730,4740 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>interp.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS></FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>sqMacExternalPrims.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 4747,4750 ---- *************** *** 4910,4913 **** --- 4920,4951 ---- <FILEFLAGS></FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacDirectory.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 5034,5042 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>interp.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>JoystickTabletPlugin.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 5072,5075 ---- *************** *** 5169,5177 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>sqMacDirectory.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>sqMacDragDrop.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 5202,5205 ---- *************** *** 5847,5850 **** --- 5875,5898 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacDirectory.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 6415,6419 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 6463,6467 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 7065,7075 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS></FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>FilePlugin.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 7113,7116 ---- *************** *** 7847,7850 **** --- 7888,7912 ---- <FILEFLAGS></FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 8246,8254 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>FilePlugin.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 8308,8311 ---- *************** *** 8804,8807 **** --- 8861,8879 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 9372,9376 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 9444,9448 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 10685,10688 **** --- 10757,10781 ---- <FILEFLAGS>Debug</FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS>Debug</FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS>Debug</FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 11557,11560 **** --- 11650,11668 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 12125,12129 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 12233,12237 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 13475,13485 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>npmac.cpp</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 13583,13586 ---- *************** *** 13557,13560 **** --- 13658,13682 ---- <FILEFLAGS>Debug</FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS>Debug</FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS>Debug</FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 14456,14464 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>npmac.cpp</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 14578,14581 ---- *************** *** 14514,14517 **** --- 14631,14649 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 15082,15086 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 15214,15218 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 16395,16398 **** --- 16527,16551 ---- <FILEFLAGS></FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 17267,17270 **** --- 17420,17438 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 17853,17857 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 18021,18025 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 18566,18576 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>InternetConfigPlugin.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 18734,18737 ---- *************** *** 19159,19162 **** --- 19320,19344 ---- <FILEFLAGS>Debug</FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS>Debug</FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS>Debug</FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 19603,19611 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>InternetConfigPlugin.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 19785,19788 ---- *************** *** 20026,20029 **** --- 20203,20221 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 20612,20616 **** <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ±</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> --- 20804,20808 ---- <SETTING><VALUE></VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> ! <SETTING><VALUE> ý</VALUE></SETTING> <SETTING><VALUE></VALUE></SETTING> </SETTING> *************** *** 21696,21706 **** <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Text</FILEKIND> - <FILEFLAGS></FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>InternetConfigPlugin.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 21888,21891 ---- *************** *** 21925,21928 **** --- 22110,22134 ---- <FILEFLAGS></FILEFLAGS> </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> + <FILE> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + <FILEKIND>Text</FILEKIND> + <FILEFLAGS></FILEFLAGS> + </FILE> </FILELIST> <LINKORDER> *************** *** 22634,22642 **** <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>plugininterp2.c</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>InternetConfigPlugin.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> --- 22840,22843 ---- *************** *** 22797,22800 **** --- 22998,23016 ---- <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>interp os9.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> </LINKORDER> </TARGET> *************** *** 23333,23343 **** </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM NS Plugin Opt</TARGETNAME> <PATHTYPE>Name</PATHTYPE> ! <PATH>plugininterp2.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>interp.c</PATH> --- 23549,23559 ---- </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> ! <PATH>interp os9.c</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Carbon Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>interp.c</PATH> *************** *** 23611,23614 **** --- 23827,23842 ---- <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.c</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> + <PATHTYPE>Name</PATHTYPE> + <PATH>sqMacEncoding.h</PATH> + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + <FILEREF> + <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> + <PATHTYPE>Name</PATHTYPE> <PATH>sqMacExternalPrims.h</PATH> <PATHFORMAT>MacOS</PATHFORMAT> *************** *** 23920,23924 **** </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Carbon Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>MSL C.CARBON.Lib</PATH> --- 24148,24152 ---- </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM NS Carbon Opt</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>MSL C.CARBON.Lib</PATH> *************** *** 23926,23930 **** </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Carbon Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>MSL SIOUX.CARBON.Lib</PATH> --- 24154,24158 ---- </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM NS Carbon Opt</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>MSL SIOUX.CARBON.Lib</PATH> *************** *** 24026,24030 **** </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Opt</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>OpenGLLibraryStub</PATH> --- 24254,24258 ---- </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>OpenGLLibraryStub</PATH> *************** *** 24032,24036 **** </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Opt</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>OpenGLUtilityStub</PATH> --- 24260,24264 ---- </FILEREF> <FILEREF> ! <TARGETNAME>Squeak VM PPC Debug</TARGETNAME> <PATHTYPE>Name</PATHTYPE> <PATH>OpenGLUtilityStub</PATH> |
