[Mit-cadr-cvs] r406 - in branches/ggilley/emulator/usim: . CADR/CADR.xcodeproj

[ggilley at common-lisp.net]

Author: ggilley
Date: Sun Dec  9 08:28:12 2012
New Revision: 406

Log:
add a MAP_SITE_TREE_DIRECTORY that controls dynamically remapping the directory defined in site.lisp and define it in the Makefile/xcode project

Modified:
   branches/ggilley/emulator/usim/CADR/CADR.xcodeproj/project.pbxproj
   branches/ggilley/emulator/usim/Files.c
   branches/ggilley/emulator/usim/Makefile
   branches/ggilley/emulator/usim/main.c

Modified: branches/ggilley/emulator/usim/CADR/CADR.xcodeproj/project.pbxproj
==============================================================================
--- branches/ggilley/emulator/usim/CADR/CADR.xcodeproj/project.pbxproj	Sat Dec  8 18:30:06 2012	(r405)
+++ branches/ggilley/emulator/usim/CADR/CADR.xcodeproj/project.pbxproj	Sun Dec  9 08:28:12 2012	(r406)
@@ -631,6 +631,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"DISPLAY_OSX=1",
+					"MAP_SITE_TREE_DIRECTORY=1",
 				);
 				INFOPLIST_FILE = "CADR/CADR-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -647,7 +648,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CADR/CADR-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = "DISPLAY_OSX=1";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DISPLAY_OSX=1",
+					"MAP_SITE_TREE_DIRECTORY=1",
+				);
 				INFOPLIST_FILE = "CADR/CADR-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

Modified: branches/ggilley/emulator/usim/Files.c
==============================================================================
--- branches/ggilley/emulator/usim/Files.c	Sat Dec  8 18:30:06 2012	(r405)
+++ branches/ggilley/emulator/usim/Files.c	Sun Dec  9 08:28:12 2012	(r406)
@@ -668,7 +668,7 @@
 void processdata(chaos_connection *conn);
 void processmini(chaos_connection *conn);
 
-
+#if defined(MAP_SITE_TREE_DIRECTORY)
 static char *treeroot;
 
 void
@@ -680,6 +680,7 @@
     
     printf("settreeroot: '%s'\n", treeroot);
 }
+#endif
 
 static void
 dumpbuffer(u_char *buf, ssize_t cnt)
@@ -4159,7 +4160,7 @@
             path++;
     } else if (*path == '/')
     {
-#if defined(OSX) || defined(linux)
+#if defined(MAP_SITE_TREE_DIRECTORY)
         if (treeroot == NULL || path[0] != '/' || tolower(path[1]) != 't' || tolower(path[2]) != 'r' ||
             tolower(path[3]) != 'e' || tolower(path[4]) != 'e' || (path[5] != '/' && path[5] != '\0'))
             wd = "";
@@ -4172,7 +4173,7 @@
             path += 6;
             freewd = 1;
         }
-#else // !defined(OSX) && !defined(linux)
+#else // !MAP_SITE_TREE_DIRECTORY
         wd = "";
 #endif
     }

Modified: branches/ggilley/emulator/usim/Makefile
==============================================================================
--- branches/ggilley/emulator/usim/Makefile	Sat Dec  8 18:30:06 2012	(r405)
+++ branches/ggilley/emulator/usim/Makefile	Sun Dec  9 08:28:12 2012	(r406)
@@ -69,7 +69,7 @@
 USIM_SRC += Files.c glob.c
 USIM_HDR += Files.h glob.h
 USIM_LIBS = -lSDLmain -lSDL -lpthread -lobjc
-CFLAGS = -O -m32 -I/usr/X11/include -DDISPLAY_X11 $(DEFINES)
+CFLAGS = -O -m32 -I/usr/X11/include -DDISPLAY_X11 -DMAP_SITE_TREE_DIRECTORY $(DEFINES)
 # good for G5
 #CFLAGS = -fast $(DEFINES)
 endif
@@ -86,7 +86,7 @@
 #CFLAGS= -O3 -march=pentium3 -mfpmath=sse -mmmx -msse $(DEFINES) -Walle
 #CFLAGS = -O3 -fomit-frame-pointer -mcpu=i686 -g $(DEFINES)
 #CFLAGS= -O3 -mfpmath=sse -mmmx -msse $(DEFINES) -Walle
-CFLAGS = -mfpmath=sse -mmmx -msse $(DEFINES) $(M32) -g
+CFLAGS = -mfpmath=sse -mmmx -msse -DMAP_SITE_TREE_DIRECTORY $(DEFINES) $(M32) -g
 LFLAGS = $(M32) -ldl -L/usr/lib
 USIM_SRC += Files.c glob.c
 USIM_HDR += Files.h glob.h

Modified: branches/ggilley/emulator/usim/main.c
==============================================================================
--- branches/ggilley/emulator/usim/main.c	Sat Dec  8 18:30:06 2012	(r405)
+++ branches/ggilley/emulator/usim/main.c	Sun Dec  9 08:28:12 2012	(r406)
@@ -212,7 +212,7 @@
 		case 'q':
 			breakpoint_set_count(atoi(optarg));
 			break;
-#if defined(OSX) || defined(linux)
+#if defined(MAP_SITE_TREE_DIRECTORY)
 		case 'r':
 			{			
 				char *p = "../../lisp";