X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..1b48afd23db9e8b5bfac8323c292b08f8f9f2e0e:/samples/png/makefile.vc diff --git a/samples/png/makefile.vc b/samples/png/makefile.vc index 6490506f26..a23c5ab47a 100644 --- a/samples/png/makefile.vc +++ b/samples/png/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,19 +12,20 @@ ### Variables: ### -WX_RELEASE_NODOT = 25 +WX_RELEASE_NODOT = 27 OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG) + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PNG_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\png.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__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.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + /I.\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ + /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ + $(CXXFLAGS) PNG_OBJECTS = \ $(OBJS)\png_pngdemo.obj \ $(OBJS)\png_pngdemo.res @@ -49,6 +50,12 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -58,6 +65,12 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -88,26 +101,23 @@ __DEBUGINFO_1 = !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_1 = /DEBUG !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = +!endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_2_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_2_p = /D_DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = -!endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_2_p = +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p_1 = /d _DEBUG !endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO_2_p = /D_DEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_2_p_1 = @@ -115,20 +125,11 @@ ____DEBUGRUNTIME_2_p_1 = !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_2_p_1 = /d _DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_2_p_1 = +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = d !endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO_2_p_1 = /d _DEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" __DEBUGRUNTIME_3 = @@ -136,21 +137,6 @@ __DEBUGRUNTIME_3 = !if "$(DEBUG_RUNTIME_LIBS)" == "1" __DEBUGRUNTIME_3 = d !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_3 = d -!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od !endif @@ -193,6 +179,12 @@ __NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" __NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ !endif +!if "$(TARGET_CPU)" == "AMD64" +__RES_TARGET_CPU_p = /d WX_CPU_AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +__RES_TARGET_CPU_p = /d WX_CPU_IA64 +!endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif @@ -235,6 +227,12 @@ __UNICODE_DEFINE_p = /D_UNICODE !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p_1 = /d _UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif @@ -284,7 +282,7 @@ clean: -if exist $(OBJS)\png.pdb del $(OBJS)\png.pdb $(OBJS)\png.exe: $(PNG_OBJECTS) $(OBJS)\png_pngdemo.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< $(PNG_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 << @@ -292,5 +290,5 @@ $(OBJS)\png_pngdemo.obj: .\pngdemo.cpp $(CXX) /c /nologo /TP /Fo$@ $(PNG_CXXFLAGS) $** $(OBJS)\png_pngdemo.res: .\pngdemo.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_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 .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $** + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) $(__RES_TARGET_CPU_p) /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 .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**