update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config...

[wxWidgets.git] / utils / ifacecheck / src / makefile.vc

diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc
index d56b6ce507c65e0307a5dab85731ab0dc586cb3a..0a5a6b36f0c4db9d8aef661c957e01efa1df241f 100644 (file)
--- a/utils/ifacecheck/src/makefile.vc
+++ b/utils/ifacecheck/src/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.3 (http://www.bakefile.org)\r
+#     Bakefile 0.2.6 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -40,10 +40,10 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = msw\r
 !endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
 !endif\r
-!if "$(DEBUG_FLAG)" == "1"\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
 WXDEBUGFLAG = d\r
 !endif\r
 !if "$(UNICODE)" == "1"\r
@@ -52,18 +52,18 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\r
 !endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
+!if "$(TARGET_CPU)" == "AMD64"\r
 DIR_SUFFIX_CPU = _amd64\r
 !endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+DIR_SUFFIX_CPU = _ia64\r
+!endif\r
 !if "$(TARGET_CPU)" == "amd64"\r
 DIR_SUFFIX_CPU = _amd64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 DIR_SUFFIX_CPU = _ia64\r
 !endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r
@@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib
 !if "$(SHARED)" == "1"\r
 LIBTYPE_SUFFIX = dll\r
 !endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
+!if "$(TARGET_CPU)" == "AMD64"\r
 LINK_TARGET_CPU = /MACHINE:AMD64\r
 !endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+LINK_TARGET_CPU = /MACHINE:IA64\r
+!endif\r
 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:AMD64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
@@ -178,11 +178,8 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
 !if "$(WXUNIV)" == "1"\r
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
 !endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"\r
-__DEBUG_DEFINE_p = /D__WXDEBUG__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "1"\r
-__DEBUG_DEFINE_p = /D__WXDEBUG__\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
 !endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
@@ -245,8 +242,8 @@ clean:
        -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb\r
 \r
 $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)\r
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<\r
-       $(IFACECHECK_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib\r
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
+       $(IFACECHECK_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
 <<\r
 \r
 $(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp\r