projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added a hack to work around the dummy kill focus messages under GTK
[wxWidgets.git]
/
src
/
makeprog.b32
diff --git
a/src/makeprog.b32
b/src/makeprog.b32
index fcf800ede934825ddf5c9a0c92e3b7b924c4d791..d53a56e9e2bc0074fe879e446ed9bf4a3d3bea84 100644
(file)
--- a/
src/makeprog.b32
+++ b/
src/makeprog.b32
@@
-13,24
+13,28
@@
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+!if "$(WXUSINGDLL)" == "1"
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng regex zlib jpeg tiff odbc32
+!else
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng regex zlib jpeg tiff odbc32
+!endif
# Note: you may need to remove some libraries for earlier versions of BC++, as below
# 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
+#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff
!if "$(FINAL)" == "0"
#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
!if "$(FINAL)" == "0"
#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
-LINKFLAGS=/v /c /
Tpe
-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c /
aa
-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS= -v
!else
#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS= -v
!else
#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
-LINKFLAGS=/
Tpe
-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(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)