X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cbff1201aa47e2b73ec90a97886f18e88270ea6..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/msw/makebase.vc

diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 8cdba7534f..557c57ab7e 100644
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:32, 2001/07/11
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T!
 
 # File:     makebase.vc
@@ -23,7 +23,6 @@ wxUSE_GUI = 0
 THISDIR=$(WXWIN)\src\msw
 
 LIBTARGET=$(WXLIB)
-DUMMYOBJ=$D/dummy.obj
 
 # This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0
@@ -100,6 +99,7 @@ COMMONOBJS = \
 		..\common\$D\objstrm.obj \
 		..\common\$D\process.obj \
 		..\common\$D\protocol.obj \
+		..\common\$D\regex.obj \
 		..\common\$D\sckaddr.obj \
 		..\common\$D\sckfile.obj \
 		..\common\$D\sckipc.obj \
@@ -139,15 +139,22 @@ MSWOBJS = ..\msw\$D\dde.obj \
 
 OBJECTS = $(COMMONOBJS) $(MSWOBJS) 
 
+ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
 # Normal, static library
-#all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
-all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET)
+#all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET)
+
 
-setuph:
+$(WXDIR)\include\wx\msw\setup.h:
     cd $(WXDIR)\include\wx\msw
     if not exist setup.h copy setup0.h setup.h
     cd $(WXDIR)\src\msw
 
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
+    copy $(WXDIR)\include\wx\msw\setup.h $@
+
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D 
 
 $D:
@@ -161,16 +168,16 @@ $(MSWDIR)\$D:
 
 ### Static library
 
-$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) 
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) 
   -erase $(LIBTARGET)
   $(implib) @<<
 -out:$@
 -machine:$(CPU)
-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)
 <<
 
-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
-        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
+$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp
 ########################################################
 
 ..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
@@ -184,7 +191,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 ..\common\lex_yy.c:    ..\common\doslex.c
     copy "..\common"\doslex.c "..\common"\lex_yy.c
 
-$(OBJECTS): $(WXDIR)/include/wx/setup.h
+$(OBJECTS): $(SETUP_H)
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
         cl @<<