Removed a deprecated wxBitmap constructor, and some

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 67c9a6854dc3bd6825c9616500f1b2931cefce43..06197a41e54567a277c53e263e662adc179bbeae 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -14,10 +14,16 @@
 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) odbc32
 !else
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng regex zlib jpeg tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS) odbc32
 !endif
 
 # Note: you may need to remove some libraries for earlier versions of BC++, as below
@@ -43,17 +49,19 @@ DEBUG_FLAGS =
 
 CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
 
+TARGETDEF =
 !if "$(wxUSE_GUI)" == "0"
 TARGETRES = 
 STARTUP = c0x32.obj    
 !else
+if exist $(TARGET).def TARGETDEF = $(TARGET).def
 TARGETRES = $(TARGET).res
 STARTUP = c0w32.obj
 !endif
 
 all: $(TARGET).exe $(EXTRATARGETS)
 
-$(TARGET).exe: $(OBJECTS) $(TARGETRES)
+$(TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES)
   $(LINK) $(LINKFLAGS) @&&!
 $(STARTUP) $(OBJECTS)
 $(TARGET)