X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e3841bf8069fbcc2b1da3ef36af4f569c604265..bca6a3a5553884d5e210706b144dc3855798934d:/distrib/msw/tmake/wat.t diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t index d20629497d..66ac91e57b 100644 --- a/distrib/msw/tmake/wat.t +++ b/distrib/msw/tmake/wat.t @@ -5,6 +5,7 @@ #! Author: Vadim Zeitlin #! Created: 14.07.99 #! Version: $Id$ +#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch #!############################################################################# #${ #! include the code which parses filelist.txt file and initializes @@ -90,7 +91,6 @@ GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTD NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") COMMONOBJS = & - $(OUTPUTDIR)\y_tab.obj & #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") @@ -111,14 +111,15 @@ $(ARCHINCDIR)\wx: $(OUTPUTDIR): @if not exist $^@ mkdir $^@ -$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx +$(SETUP_H): $(ARCHINCDIR)\wx + if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup.h $@ LBCFILE=wx$(TOOLKIT).lbc $(LIBTARGET) : $(OBJECTS) %create $(LBCFILE) @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i - wlib /b /c /n /p=512 $^@ @$(LBCFILE) + wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE) clean: .SYMBOLIC $(EXTRATARGETSCLEAN) @@ -183,14 +184,6 @@ cleanall: clean } #$} -$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c ######################################################## # Generic objects (not always compiled, depending on