Added code to the template to copy setup0.h to setup.h if setup.h does not exist (due to checkout from CVS).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -155,11 +155,15 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
# Normal, static library
|
||||
all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
|
||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
|
||||
|
||||
setuph:
|
||||
cd $(WXDIR)\include\wx\msw
|
||||
if not exist setup.h copy setup0.h setup.h
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
|
||||
|
||||
|
||||
$D:
|
||||
mkdir $D
|
||||
|
||||
@@ -330,16 +334,6 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
|
||||
$(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
|
||||
<<
|
||||
|
||||
# If taking wxWindows from CVS, setup.h doesn't exist yet.
|
||||
# Actually the 'if not exist setup.h' test doesn't work
|
||||
# (copies the file anyway)
|
||||
# we'll have to comment this rule out.
|
||||
|
||||
# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
|
||||
# cd "$(WXDIR)"\include\wx\msw
|
||||
# if not exist setup.h copy setup0.h setup.h
|
||||
# cd "$(WXDIR)"\src\msw
|
||||
|
||||
..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c
|
||||
cl @<<
|
||||
$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
|
||||
|
Reference in New Issue
Block a user