Added #include wx/dcclient.h for Vadims changes to work without pc headers

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 325dd50e774868dae7788ba4ed77643e393aba05..5f879ff864a3dd08e9ff6d4a5b94db854851d23d 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,18 +13,21 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 

-LIBS=$(WXLIB) cw32mt import32 ole2w32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg

 
 !if "$(FINAL)" == "0"
 
 !if "$(FINAL)" == "0"

-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)

 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 OPT = -Od
 DEBUG_FLAGS= -v
 !else

-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)

 OPT = -Od
 DEBUG_FLAGS =
 !endif
 OPT = -Od
 DEBUG_FLAGS =
 !endif

-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG)
+
+all: $(TARGET).exe $(EXTRATARGETS)

 
 $(TARGET).exe: $(OBJECTS) $(TARGET).res
   tlink32 $(LINKFLAGS) @&&!
 
 $(TARGET).exe: $(OBJECTS) $(TARGET).res
   tlink32 $(LINKFLAGS) @&&!