Committing in .

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 67c9a6854dc3bd6825c9616500f1b2931cefce43..c3c7e7b7fbb07c223c68a41bfecf17664e517e01 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -5,8 +5,9 @@
 # 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  set by parent make
 # BCCDIR set in makeb32.env
@@ -14,10 +15,20 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
+!if "$(wxUSE_GUI)" == "0"
+IMGLIBS=
+!else
+IMGLIBS= winpng jpeg tiff
+!endif
+
 !if "$(WXUSINGDLL)" == "1"
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng regex zlib jpeg tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS) 
 !else
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng regex zlib jpeg tiff odbc32
+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
@@ -53,13 +64,13 @@ STARTUP = c0w32.obj
 
 all: $(TARGET).exe $(EXTRATARGETS)
 
-$(TARGET).exe: $(OBJECTS) $(TARGETRES)
+$(TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES)
   $(LINK) $(LINKFLAGS) @&&!
 $(STARTUP) $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
-
+$(TARGETDEF)
 $(TARGETRES)
 !