projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug #101 (wxListCtrl::GetItemRect() returns rectangle with incorrect height) fixed
[wxWidgets.git]
/
src
/
makeb32.env
diff --git
a/src/makeb32.env
b/src/makeb32.env
index fec3d1afce54fb6112acf666b5051b31b0e8eaa3..28da42ee5fbec766be900af55c6eda3560931251 100644
(file)
--- a/
src/makeb32.env
+++ b/
src/makeb32.env
@@
-42,16
+42,16
@@
DLL=0
#
!if "$(WXMAKINGDLL)" == "1"
#
!if "$(WXMAKINGDLL)" == "1"
-DLL_FLAGS= -DWXMAKINGDLL=1 -D_
WIN
DLL
-WXLIB= $(WXLIBDIR)\wx2
0
0.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_
RTL
DLL
+WXLIB= $(WXLIBDIR)\wx2
2
0.lib
!else
LINK_FLAGS= /aa /c
!if "$(WXUSINGDLL)" == "1"
!else
LINK_FLAGS= /aa /c
!if "$(WXUSINGDLL)" == "1"
-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx2
0
0.lib
+DLL_FLAGS= -DWXUSINGDLL=1
-D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx2
2
0.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib
@@
-60,7
+60,6
@@
WXLIB= $(WXLIBDIR)\wx32.lib
!endif
!if "$(WXBUILDDLL)" == "1"
!endif
!if "$(WXBUILDDLL)" == "1"
-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
!endif
LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
!endif