checked in forgottern parts of MSLU changes

[wxWidgets.git] / distrib / msw / tmake / basevc.t

diff --git a/distrib/msw/tmake/basevc.t b/distrib/msw/tmake/basevc.t
index a882ebac9499161ba0e4ff8f7ffc928a0183250b..8172a32f65492bd129605827f6812a96eb15dfe3 100644 (file)
--- a/distrib/msw/tmake/basevc.t
+++ b/distrib/msw/tmake/basevc.t
@@ -31,7 +31,7 @@
         $project{"WXCOMMONOBJS"} .= "..\\common\\\$D\\" . $file . " "
     }
 #$}
         $project{"WXCOMMONOBJS"} .= "..\\common\\\$D\\" . $file . " "
     }
 #$}

-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T!
 
 # File:     makebase.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T!
 
 # File:     makebase.vc


@@ -56,7 +56,6 @@ wxUSE_GUI = 0
 THISDIR=$(WXWIN)\src\msw
 
 LIBTARGET=$(WXLIB)
 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
 
 # This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0


@@ -100,15 +99,21 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
 
 OBJECTS = $(COMMONOBJS) $(MSWOBJS) 
 
 
 OBJECTS = $(COMMONOBJS) $(MSWOBJS) 
 

+ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+

 # Normal, static library
 # 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
 
     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:
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D 
 
 $D:


@@ -122,16 +127,16 @@ $(MSWDIR)\$D:
 
 ### Static library
 
 
 ### Static library
 

-$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) 
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) 

   -erase $(LIBTARGET)
   $(implib) @<<
 -out:$@
 -machine:$(CPU)
   -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
 ########################################################
 
 ..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c