X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bf78aae345c474fe75c0d9df43cf3aaeaf75d57..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/makeprog.b32 diff --git a/src/makeprog.b32 b/src/makeprog.b32 index 325dd50e77..d53a56e9e2 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -13,21 +13,33 @@ WXDIR = $(WXWIN) !include $(WXDIR)\src\makeb32.env -LIBS=$(WXLIB) cw32mt import32 ole2w32 +!if "$(WXUSINGDLL)" == "1" +LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng regex zlib jpeg tiff odbc32 +!else +LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng regex zlib jpeg tiff odbc32 +!endif + +# Note: you may need to remove some libraries for earlier versions of BC++, as below +#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff !if "$(FINAL)" == "0" -LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib +#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS) +LINKFLAGS=/v /c /aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) OPT = -Od DEBUG_FLAGS= -v !else -LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib +#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS) +LINKFLAGS=/aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) OPT = -Od DEBUG_FLAGS = !endif -CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) + +CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT) + +all: $(TARGET).exe $(EXTRATARGETS) $(TARGET).exe: $(OBJECTS) $(TARGET).res - tlink32 $(LINKFLAGS) @&&! + $(LINK) $(LINKFLAGS) @&&! c0w32.obj $(OBJECTS) $(TARGET) nul @@ -43,7 +55,7 @@ $(TARGET).res bcc32 $(CPPFLAGS) -P- -c {$< } $(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc - brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET) + brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(TARGET) clean: -erase *.obj @@ -51,4 +63,6 @@ clean: -erase *.res -erase *.map -erase *.rws + -erase *.tds + -erase *.il?