A few tweaks and cleanups

[wxWidgets.git] / src / msw / makebase.vc

diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 24cdcf1cf85c7cf16dcfed1371a0ab58356ad4f6..9339fdb0ac15007993d5e04e33820419b87745a2 100644 (file)
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:56, 2001/11/03
+# 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


@@ -23,7 +23,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


@@ -62,6 +61,7 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $<
 COMMONOBJS = \
     ..\common\$D\y_tab.obj \
     ..\common\$D\appcmn.obj \
 COMMONOBJS = \
     ..\common\$D\y_tab.obj \
     ..\common\$D\appcmn.obj \

+               ..\common\$D\clntdata.obj \

                ..\common\$D\cmdline.obj \
                ..\common\$D\config.obj \
                ..\common\$D\datetime.obj \
                ..\common\$D\cmdline.obj \
                ..\common\$D\config.obj \
                ..\common\$D\datetime.obj \


@@ -71,6 +71,7 @@ COMMONOBJS = \
                ..\common\$D\dircmn.obj \
                ..\common\$D\dynarray.obj \
                ..\common\$D\dynlib.obj \
                ..\common\$D\dircmn.obj \
                ..\common\$D\dynarray.obj \
                ..\common\$D\dynlib.obj \

+               ..\common\$D\dynload.obj \

                ..\common\$D\encconv.obj \
                ..\common\$D\event.obj \
                ..\common\$D\extended.obj \
                ..\common\$D\encconv.obj \
                ..\common\$D\event.obj \
                ..\common\$D\extended.obj \


@@ -86,6 +87,7 @@ COMMONOBJS = \
                ..\common\$D\fs_zip.obj \
                ..\common\$D\ftp.obj \
                ..\common\$D\hash.obj \
                ..\common\$D\fs_zip.obj \
                ..\common\$D\ftp.obj \
                ..\common\$D\hash.obj \

+               ..\common\$D\hashmap.obj \

                ..\common\$D\http.obj \
                ..\common\$D\intl.obj \
                ..\common\$D\ipcbase.obj \
                ..\common\$D\http.obj \
                ..\common\$D\intl.obj \
                ..\common\$D\ipcbase.obj \


@@ -97,7 +99,6 @@ COMMONOBJS = \
                ..\common\$D\module.obj \
                ..\common\$D\mstream.obj \
                ..\common\$D\object.obj \
                ..\common\$D\module.obj \
                ..\common\$D\mstream.obj \
                ..\common\$D\object.obj \

-               ..\common\$D\objstrm.obj \

                ..\common\$D\process.obj \
                ..\common\$D\protocol.obj \
                ..\common\$D\regex.obj \
                ..\common\$D\process.obj \
                ..\common\$D\protocol.obj \
                ..\common\$D\regex.obj \


@@ -105,12 +106,12 @@ COMMONOBJS = \
                ..\common\$D\sckfile.obj \
                ..\common\$D\sckipc.obj \
                ..\common\$D\sckstrm.obj \
                ..\common\$D\sckfile.obj \
                ..\common\$D\sckipc.obj \
                ..\common\$D\sckstrm.obj \

-               ..\common\$D\serbase.obj \

                ..\common\$D\socket.obj \
                ..\common\$D\strconv.obj \
                ..\common\$D\stream.obj \
                ..\common\$D\string.obj \
                ..\common\$D\sysopt.obj \
                ..\common\$D\socket.obj \
                ..\common\$D\strconv.obj \
                ..\common\$D\stream.obj \
                ..\common\$D\string.obj \
                ..\common\$D\sysopt.obj \

+               ..\common\$D\textbuf.obj \

                ..\common\$D\textfile.obj \
                ..\common\$D\timercmn.obj \
                ..\common\$D\tokenzr.obj \
                ..\common\$D\textfile.obj \
                ..\common\$D\timercmn.obj \
                ..\common\$D\tokenzr.obj \


@@ -136,19 +137,26 @@ MSWOBJS = ..\msw\$D\dde.obj \
                ..\msw\$D\snglinst.obj \
                ..\msw\$D\thread.obj \
                ..\msw\$D\utils.obj \
                ..\msw\$D\snglinst.obj \
                ..\msw\$D\thread.obj \
                ..\msw\$D\utils.obj \

-               ..\msw\$D\utilsexc.obj
+               ..\msw\$D\utilsexc.obj \
+               ..\msw\$D\volume.obj

 
 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:


@@ -162,16 +170,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