X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b14391d1c8fde767eabedd2243dd6583f685f53f..06ea1f023e3f0b4318b3d44dcd15c304b7306025:/src/makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index b51ac397b9..c3c7e7b7fb 100644
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -5,38 +5,73 @@
 # Updated:	
 # Copyright:
 #
-# Include file for samples and utilities. Set TARGET and OBJECTS
-# before including this file.
+# Include file for samples and utilities. Set TARGET, OBJECTS and 
+# TARGETDEF (if you want to include a DEF file in the build) before
+# including this file.
 
-# WXWIN and BCCDIR are set by parent make
+# WXWIN  set by parent make
+# BCCDIR set in makeb32.env
 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+!if "$(wxUSE_GUI)" == "0"
+IMGLIBS=
+!else
+IMGLIBS= winpng jpeg tiff
+!endif
+
+!if "$(WXUSINGDLL)" == "1"
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS) 
+!else
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS)
+!endif
+
+!if "$(wxUSE_ODBC)" == "1"
+LIBS=$(LIBS) 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 "$(wxUSE_GUI)" == "0"
+LINKOUT = /ap
+!else
+LINKOUT = /aa
+!endif
 
 !if "$(FINAL)" == "0"
-LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib $(EXTRALINKFLAGS)
+#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v
 !else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib $(EXTRALINKFLAGS)
+#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
+LINKFLAGS=$(LINKOUT) -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)
+
+!if "$(wxUSE_GUI)" == "0"
+TARGETRES = 
+STARTUP = c0x32.obj	
+!else
+TARGETRES = $(TARGET).res
+STARTUP = c0w32.obj
+!endif
 
 all: $(TARGET).exe $(EXTRATARGETS)
 
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
+$(TARGET).exe:	$(OBJECTS) $(TARGETDEF) $(TARGETRES)
   $(LINK) $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
+$(STARTUP) $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
-
-$(TARGET).res
+$(TARGETDEF)
+$(TARGETRES)
 !
 
 .$(SRCSUFF).obj: