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

23
distrib/msw/tmake/basevc.t
View File

@@ -56,7 +56,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,15 +99,21 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
OBJECTS = $(COMMONOBJS) $(MSWOBJS)
# 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)
ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT)
SETUP_H=$(ARCHINCDIR)\wx\setup.h
setuph:
# Normal, static library
#all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET)
$(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:
@@ -122,16 +127,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