Make build switchable by defining (or not) TCL_LOAD_FROM_MEMORY

win/Makefile.in

@@ -453,7 +453,6 @@ TOMMATH_OBJS = \
 
 
 WIN_OBJS = \
-	MemoryModule.$(OBJEXT) \
 	tclWin32Dll.$(OBJEXT) \
 	tclWinChan.$(OBJEXT) \
 	tclWinConsole.$(OBJEXT) \
@@ -703,9 +702,6 @@ tclZipfs.${OBJEXT}: $(GENERIC_DIR)/tclZipfs.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl \
 	$(ZLIB_INCLUDE) -I$(MINIZIP_DIR_NATIVE)  @DEPARG@ $(CC_OBJNAME)
 
-MemoryModule.${OBJEXT}: $(WIN_DIR)/MemoryModule.c
-	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)
-
 
 # TIP #59, embedding of configuration information into the binary library.
 #

win/makefile.vc

@@ -429,7 +429,6 @@ TOMMATHOBJS = $(OUT_DIR)\tommath.lib
 !endif
 
 PLATFORMOBJS = \
-	$(TMP_DIR)\MemoryModule.obj \
 	$(TMP_DIR)\tclWin32Dll.obj \
 	$(TMP_DIR)\tclWinChan.obj \
 	$(TMP_DIR)\tclWinConsole.obj \
@@ -915,9 +914,6 @@ $(TMP_DIR)\tclZipfs.obj: $(GENERICDIR)\tclZipfs.c
 $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
 	$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?
 
-$(TMP_DIR)\MemoryModule.obj: $(WIN_DIR)\MemoryModule.c
-	$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE -Fo$@ $?
-
 # Following the lead of the autoconf based make, we define the
 # CFG_RUNTIME_*DIR flags specifically for tclPkgConfig
 # and not as part of the global defines. These are all defined

win/tclWinLoad.c

@@ -13,9 +13,11 @@
 
 #include "tclWinInt.h"
 #ifdef TCL_LOAD_FROM_MEMORY
+#undef  UNICODE
 #undef  _UNICODE
+#define UNICODE
 #define _UNICODE
-#include "MemoryModule.h"
+#include "MemoryModule.c"
 #endif
 
 /*