Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
George Tasker
2002-01-15 20:32:23 +00:00
parent 2557f8d858
commit b311dc08be
5 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
distrib/msw/tmake/vc.t
View File

@@ -78,10 +78,8 @@ THISDIR=$(WXWIN)\src\msw
!if "$(WXMAKINGDLL)" == "1"
LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
DUMMYOBJ=$D\dummydll.obj
!else
LIBTARGET=$(WXLIB)
DUMMYOBJ=$D\dummy.obj
!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
$(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 $@
@@ -247,12 +250,12 @@ pch1: dirs $(DUMMYOBJ)
### 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)
$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)
<<
!else
@@ -301,13 +304,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(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).