fix for assert when setting tooltip for a readonly combo

[wxWidgets.git] / src / makeprog.b32

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 414ac24c4abdbc49b4f88972380e6d9481dd1fff..57d43f8396feeaf2b43b629028a8fa28bb0966c2 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,19 +13,28 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 

+!if "$(WXUSINGDLL)" == "1"
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+!else

 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm 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 xpm tiff

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

-LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(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
 OPT = -Od
 DEBUG_FLAGS= -v
 !else

-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
+LINKFLAGS=/aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)

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

-CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG)
+CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)

 
 all: $(TARGET).exe $(EXTRATARGETS)
 
 
 all: $(TARGET).exe $(EXTRATARGETS)