X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e97b17bbd1ebcda40b4ed10314755ecf35e8ae2..ede7020ab37352c03ce6edaaf2fc080c731e97fd:/distrib/msw/tmake/b32.t?ds=sidebyside diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index 86aa07b341..4738330437 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -29,6 +29,8 @@ } foreach $file (sort keys %wxCommon) { + next if $wxCommon{$file} =~ /\b(16|U)\b/; + $isCFile = $file =~ /\.c$/; $file =~ s/cp?p?$/obj/; $obj = "\$(MSWDIR)\\" . $file . " "; @@ -39,11 +41,12 @@ foreach $file (sort keys %wxMSW) { next if $wxMSW{$file} =~ /\b16\b/; - if ( $file =~ /^automtn/ ) { - #! comment in old makefile.b32 seems to imply that this file can't - #! be compiled with Borland (leads to crash in oleauto sample) - next; - } +#! if ( $file =~ /^automtn/ ) { +#! #! comment in old makefile.b32 seems to imply that this file can not +#! #! be compiled with Borland (leads to crash in oleauto sample) +#! No longer true, at least for BC++ 5.2 +#! next; +#! } $isCFile = $file =~ /\.c$/; @@ -60,7 +63,7 @@ } #$} -# This file was automatically generated by tmake at #$ Now() +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -97,7 +100,6 @@ WXBUILDDLL=1 # Please set these according to the settings in wx_setup.h, so we can include # the appropriate libraries in wx.lib USE_CTL3D=0 -USE_XPM_IN_MSW=1 PERIPH_LIBS= PERIPH_TARGET= @@ -110,22 +112,16 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) !endif -!if "$(USE_XPM_IN_MSW)" == "1" -PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS) -PERIPH_TARGET=xpm $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) -!endif - -#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS) +#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS) PERIPH_LIBS= -PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) +PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET) +PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET) !if "$(DLL)" == "0" DUMMY=dummy !else DUMMY=dummydll -LIBS= cw32 import32 ole2w32 +LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex !endif LIBTARGET=$(WXLIB) @@ -143,7 +139,6 @@ GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); # Not needed: # $(MSWDIR)\colrdlgg.obj \ # $(MSWDIR)\fontdlgg.obj \ -# $(MSWDIR)\helpxlp.obj \ # $(MSWDIR)\msgdlgg.obj \ # $(MSWDIR)\printps.obj \ # $(MSWDIR)\prntdlgg.obj \ @@ -163,15 +158,21 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) default: wx -wx: $(CFG) $(LNKCFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) +wx: setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) + +# TODO: put the setup.h under lib +setuph: + cd $(WXDIR)\include\wx\msw + if not exist setup.h copy setup0.h setup.h + cd $(WXDIR)\src\msw -all: all_libs all_execs +all: wx !if "$(DLL)" == "0" $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) - tlib $(LIBTARGET) /P1024 @&&! + tlib "$(LIBTARGET)" /P1024 @&&! +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! @@ -180,19 +181,21 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) -erase $(WXLIBDIR)\wx.dll - tlink32 $(LINK_FLAGS) /v @&&! + $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&! c0d32.obj $(OBJECTS) $(WXLIBDIR)\wx nul $(PERIPH_LIBS) $(LIBS) wxb32 ! + -erase $(WXLIBDIR)\version.res + brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll !endif dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h -dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h +dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res $(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c @@ -280,16 +283,6 @@ all_execs: make -f makefile.b32 all_execs cd $(WXDIR)\src\msw -wxxpm: $(CFG) - cd $(WXDIR)\src\xpm - make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG) - cd $(WXDIR)\src\msw - -clean_wxxpm: $(CFG) - cd $(WXDIR)\src\xpm - make -f makefile.b32 clean - cd $(WXDIR)\src\msw - png: $(CFG) cd $(WXDIR)\src\png make -f makefile.b32 @@ -320,13 +313,13 @@ clean_jpeg: make -f makefile.b32 clean cd $(WXDIR)\src\msw -xpm: $(CFG) - cd $(WXDIR)\src\xpm +regex: $(CFG) + cd $(WXDIR)\src\regex make -f makefile.b32 lib cd $(WXDIR)\src\msw -clean_xpm: - cd $(WXDIR)\src\xpm +clean_regex: + cd $(WXDIR)\src\regex make -f makefile.b32 clean cd $(WXDIR)\src\msw @@ -342,6 +335,7 @@ clean_tiff: $(CFG): makefile.b32 copy &&! +-Hc -H=$(WXDIR)\src\msw\wx32.csm -3 -d @@ -354,7 +348,7 @@ $(CFG): makefile.b32 -WE -tWM --I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff +-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff -I$(WXDIR)\include\wx\msw\gnuwin32 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @@ -367,16 +361,11 @@ $(DEBUG_FLAGS) $(WIN95FLAG) ! $(CFG) -$(LNKCFG): makefile.b32 - copy &&! --L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -! $(LNKCFG) - -#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib -# -Oxt - clean: $(PERIPH_CLEAN_TARGET) -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll + -erase $(WXLIBDIR)\wx.tds + -erase $(WXLIBDIR)\wx.il? -erase *.obj -erase *.pch -erase *.csm