Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "d" suffix according to DEBUG_RUNTIME_LIBS, not DEBUG_FLAG.

Browse Source 
The "d" suffix is now only used under Windows and indicates that we link with
debug CRT version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-12 11:29:11 +00:00
parent 7d9550df50
commit c6684d425d
68 changed files with 1077 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build/msw/makefile.bcc
View File

@@ -1375,10 +1375,7 @@ VENDORTAG = _$(VENDOR)
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
!if "$(BUILD)" == "debug"
WXDEBUGFLAG = d
!endif
!if "$(UNICODE)" == "1"
@@ -4127,11 +4124,8 @@ __RUNTIME_LIBS_4 =
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_58 = -d__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p_57 = -d__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p_57 = -d__WXDEBUG__
!if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p_57 = -dwxDEBUG_LEVEL=0
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONS_DEFINE_p_57 = -dwxNO_EXCEPTIONS
@@ -4202,11 +4196,8 @@ __RUNTIME_LIBS =
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS