dummy(dll).obj is now created in wxWin/$D rather than wxWin/src/msw/$D

makefile.vc and makebase.vc no longer override the location of dummy(dll).obj that is specified in makevc.env
if wxWin/include/wx/msw/setup.h does not exist, setup0.h is copied to setup.h
[BASE builds]setup.h is no longer used from wxWin/include/wx, it is now used just like with makefile.vc.  setup.h is copied from wxWin/include/wx/msw into wxWin/lib/base(d)/wx and all references to setup.h now read this location

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/basevc.t b/distrib/msw/tmake/basevc.t
index a882ebac9499161ba0e4ff8f7ffc928a0183250b..5e43afafd8ab1d34f8c4b4cdbcdb6523c7977ab4 100644 (file)
--- a/distrib/msw/tmake/basevc.t
+++ b/distrib/msw/tmake/basevc.t
@@ -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

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 19b21b7ab9b65ef2261270d0843298665c854000..ec1e8d827950899e96dcb25bb79f465901268366 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -78,10 +78,8 @@ THISDIR=$(WXWIN)\src\msw
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll

-DUMMYOBJ=$D\dummydll.obj

 !else
 LIBTARGET=$(WXLIB)
 !else
 LIBTARGET=$(WXLIB)

-DUMMYOBJ=$D\dummy.obj

 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h
 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h


@@ -176,6 +174,11 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 

+$(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 $@
 
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
     copy $(WXDIR)\include\wx\msw\setup.h $@
 


@@ -247,12 +250,12 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### Static library
 
 
 ### Static library
 

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

        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)

-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)

 <<
 
 !else
 <<
 
 !else


@@ -301,13 +304,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects
 

-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
-        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
-
-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
-        cl @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp

 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).
 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).

diff --git a/src/makevc.env b/src/makevc.env
index a90795b8f02d3134494c47f7faba84e20c44bd27..1cc2495852fd669ad64dd8629d9863ade80362f9 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -170,7 +170,13 @@ INCEXT=dll$(INCEXT)
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-INC=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
+!if "$(wxUSE_GUI)" == "0"
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/base$(INCEXT)
+!else
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT)
+!endif
+
+INC=$(INCTEMP) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff

 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib
 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib

diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 24cdcf1cf85c7cf16dcfed1371a0ab58356ad4f6..557c57ab7e24dab3118bdbd33188eb6a5a2b7b16 100644 (file)
--- a/src/msw/makebase.vc
+++ b/src/msw/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


@@ -140,15 +139,22 @@ MSWOBJS = ..\msw\$D\dde.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 +168,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


@@ -185,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
 
 ..\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 @<<
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
         cl @<<

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 614a5d7115a48129f4e02c83a0c9dc6dcd0cf6a1..734fbaa0e616889497a1c21c27c4e74d5592f44a 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -21,10 +21,8 @@ THISDIR=$(WXWIN)\src\msw
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll

-DUMMYOBJ=$D\dummydll.obj

 !else
 LIBTARGET=$(WXLIB)
 !else
 LIBTARGET=$(WXLIB)

-DUMMYOBJ=$D\dummy.obj

 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h
 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h


@@ -54,7 +52,6 @@ JPEGDIR = $(WXDIR)\src\jpeg
 TIFFDIR = $(WXDIR)\src\tiff
 REGEXDIR = $(WXDIR)\src\regex
 
 TIFFDIR = $(WXDIR)\src\tiff
 REGEXDIR = $(WXDIR)\src\regex
 

-

 {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<


@@ -403,6 +400,11 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 

+$(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 $@
 
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
     copy $(WXDIR)\include\wx\msw\setup.h $@
 


@@ -474,12 +476,12 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### Static library
 
 
 ### Static library
 

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

        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)

-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)

 <<
 
 !else
 <<
 
 !else


@@ -528,13 +530,9 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects
 

-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(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

 
 

-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
-        cl @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<

 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).
 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).