X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..5cf1cb1006d6b5762d96c07ee3892883607460c7:/contrib/build/net/makefile.vc diff --git a/contrib/build/net/makefile.vc b/contrib/build/net/makefile.vc index 5c9f524e23..378a6a4e75 100644 --- a/contrib/build/net/makefile.vc +++ b/contrib/build/net/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.8 (http://bakefile.sourceforge.net) +# Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,20 +12,21 @@ ### Variables: ### -WX_RELEASE_NODOT = 25 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5 +WX_RELEASE_NODOT = 27 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = ..\..\src\net\..\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG) + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + ..\..\src\net\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NETUTILSDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME_4) /DWIN32 \ +NETUTILSDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO_1) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\src\net\..\..\..\include /I$(SETUPHDIR) /W4 \ + $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\src\net\..\..\..\include /W4 \ /I..\..\src\net\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_NETUTILS \ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_netutilsdll.pch" $(CPPFLAGS) $(CXXFLAGS) @@ -35,13 +36,13 @@ NETUTILSDLL_OBJECTS = \ $(OBJS)\netutilsdll_email.obj \ $(OBJS)\netutilsdll_smapi.obj \ $(OBJS)\netutilsdll_web.obj -NETUTILSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME_17) /DWIN32 \ +NETUTILSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO_1) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.pdb \ - $(____DEBUGRUNTIME_16_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\src\net\..\..\..\include /I$(SETUPHDIR) /W4 \ + $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\src\net\..\..\..\include /W4 \ /I..\..\src\net\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netutilslib.pch" $(CPPFLAGS) \ $(CXXFLAGS) @@ -77,6 +78,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -86,6 +99,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -108,14 +133,11 @@ __DEBUGINFO_2 = !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_2 = /DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_3_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = $(____DEBUGINFO) +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_3_p_1 = @@ -123,30 +145,6 @@ ____DEBUGRUNTIME_3_p_1 = !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_3_p_1 = /d _DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p_1 = $(____DEBUGINFO_3_p_1) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_3_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_3_p_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_3_p_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO_3_p_1 = /d _DEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_4 = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = $(__DEBUGINFO) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_9 = D !endif @@ -180,6 +178,9 @@ __THREAD_DEFINE_p_1 = /d wxNO_THREADS !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p_1 = /d _UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif !if "$(MONOLITHIC)" == "1" __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -208,24 +209,6 @@ __WXLIB_BASE_p = \ __netutilslib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_16_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_16_p = /D_DEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_16_p = $(____DEBUGINFO) -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_17 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_17 = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_17 = $(__DEBUGINFO) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_22 = D !endif @@ -244,29 +227,29 @@ __DEBUGINFO_1 = !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_1 = /Zi !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = /D_DEBUG !endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO = +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO = +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO = /D_DEBUG +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME = /D_DEBUG !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = d +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = d !endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = d +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME = d !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -319,6 +302,9 @@ __THREAD_DEFINE_p = /DwxNO_THREADS !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /D_UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif all: $(OBJS) @@ -341,15 +327,15 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /LIBPATH:$(LIBDIRNAME) @<< - $(NETUTILSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_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 oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<< + $(NETUTILSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_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 odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib << !endif !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib: $(OBJS)\netutilslib_dummy.obj $(NETUTILSLIB_OBJECTS) if exist $@ del $@ - lib /NOLOGO /OUT:$@ @<< + link /LIB /NOLOGO /OUT:$@ @<< $(NETUTILSLIB_OBJECTS) << !endif @@ -357,8 +343,8 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD $(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) /Ycwx/wxprec.h $** -$(OBJS)\netutilsdll_version.res: ../../src/net\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i ..\..\src\net\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG) $** +$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i ..\..\src\net\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG) $** $(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $**