X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e97b17bbd1ebcda40b4ed10314755ecf35e8ae2..7d1f4c3ff01b09105c07d5e176a14428c834975e:/src/makeprog.b32?ds=inline diff --git a/src/makeprog.b32 b/src/makeprog.b32 index 5ecd5c0caf..d53a56e9e2 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -13,19 +13,28 @@ WXDIR = $(WXWIN) !include $(WXDIR)\src\makeb32.env -LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32 +!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 /c /Tpe +$(LNKCFG) $(EXTRALINKFLAGS) +#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 +$(LNKCFG) $(EXTRALINKFLAGS) +#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS) +LINKFLAGS=/aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) OPT = -Od DEBUG_FLAGS = !endif -CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG) +CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT) all: $(TARGET).exe $(EXTRATARGETS)