Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc
index a80304effbaed28cc1ded4995cbddb6baac31dd6..9e1c6ea3acca8aa7e705cba09c0628f5434aad94 100644 (file)
--- a/utils/ifacecheck/src/makefile.vc
+++ b/utils/ifacecheck/src/makefile.vc
@@ -15,31 +15,63 @@
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
 LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
        $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(____DEBUGRUNTIME_3_p) \\r
-       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
-       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \\r
-       /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
+       $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+       /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
+       $(CXXFLAGS)
 IFACECHECK_OBJECTS =  \\r
        $(OBJS)\ifacecheck_ifacecheck.obj \\r
        $(OBJS)\ifacecheck_xmlparser.obj\r
 \r
 ### Conditionally set variables: ###\r
 \r
+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+!endif
+!if "$(TOOLKIT)" == "MAC"
+WXBASEPORT = _carbon
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
@@ -53,18 +85,6 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\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)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r
@@ -80,17 +100,23 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:X64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO_0 = /Zi\r
@@ -238,16 +264,22 @@ __DLLFLAG_p = /DWXUSINGDLL
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
@@ -277,7 +309,7 @@ clean:
 \r
 $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(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) $(__CAIRO_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
+       $(IFACECHECK_OBJECTS)   $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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