X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..a4ad36cdc53b0df79a51386c15a384beb2f7333a:/samples/wxtest/makefile.vc?ds=sidebyside diff --git a/samples/wxtest/makefile.vc b/samples/wxtest/makefile.vc index d107ad23cc..7241b36eab 100644 --- a/samples/wxtest/makefile.vc +++ b/samples/wxtest/makefile.vc @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include <../../build/config.vc> +!include <../../build/msw/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -12,22 +12,29 @@ ### Variables: ### -LIBDIRNAME = \ - .\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxtest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(LIBDIRNAME) /I.\..\..\src\tiff \ - /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex \ - /I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS) + $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) WXTEST_OBJECTS = \ - $(OBJS)\wxtest_wxtest.obj \ - $(OBJS)\wxtest_wxtest.res + $(OBJS)\wxtest_sample.res \ + $(OBJS)\wxtest_test.obj \ + $(OBJS)\wxtest_test_wdr.obj ### Conditionally set variables: ### +!if "$(SHARED)" == "0" +LIBDIRNAME = .\..\..\lib\vc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +LIBDIRNAME = .\..\..\lib\vc_dll$(CFG) +!endif !if "$(USE_GUI)" == "0" PORTNAME = base !endif @@ -112,6 +119,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /d WXUSINGDLL !endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_8 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_8 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_9 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_9 = /GX +!endif !if "$(USE_GUI)" == "1" __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !endif @@ -121,6 +140,18 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od !endif @@ -134,10 +165,13 @@ __RUNTIME_LIBS_7 = D __RUNTIME_LIBS_7 = T !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +__UNICODE_DEFINE_p = /D_UNICODE !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1 +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib @@ -160,10 +194,10 @@ __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ ____DEBUGINFO_2_p = /D_DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = /DNDEBUG +____DEBUGINFO_2_p = !endif !if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_2_p = /DNDEBUG +____DEBUGINFO_2_p = !endif !if "$(DEBUG_INFO)" == "1" ____DEBUGINFO_2_p = /D_DEBUG @@ -172,16 +206,16 @@ ____DEBUGINFO_2_p = /D_DEBUG ____DEBUGINFO_2_p_1 = /d _DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p_1 = /d NDEBUG +____DEBUGINFO_2_p_1 = !endif !if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_2_p_1 = /d NDEBUG +____DEBUGINFO_2_p_1 = !endif !if "$(DEBUG_INFO)" == "1" ____DEBUGINFO_2_p_1 = /d _DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = /DNDEBUG +____DEBUGRUNTIME_2_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_2_p = /D_DEBUG @@ -190,7 +224,7 @@ ____DEBUGRUNTIME_2_p = /D_DEBUG ____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = /d NDEBUG +____DEBUGRUNTIME_2_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_2_p_1 = /d _DEBUG @@ -208,18 +242,23 @@ $(OBJS): all: $(OBJS)\wxtest.exe -$(OBJS)\wxtest_wxtest.obj: .\wxtest.cpp +$(OBJS)\wxtest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $** + +$(OBJS)\wxtest_test.obj: .\test.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXTEST_CXXFLAGS) $** -$(OBJS)\wxtest_wxtest.res: .\wxtest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(LIBDIRNAME) /i .\..\..\src\tiff /i .\..\..\src\jpeg /i .\..\..\src\png /i .\..\..\src\zlib /i .\..\..\src\regex /i .\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $** +$(OBJS)\wxtest_test_wdr.obj: .\test_wdr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXTEST_CXXFLAGS) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe + -if exist $(OBJS)\wxtest.ilk del $(OBJS)\wxtest.ilk + -if exist $(OBJS)\wxtest.pdb del $(OBJS)\wxtest.pdb -$(OBJS)\wxtest.exe: $(WXTEST_OBJECTS) $(OBJS)\wxtest_wxtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< - $(WXTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\wxtest.exe: $(WXTEST_OBJECTS) $(OBJS)\wxtest_sample.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + $(WXTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib <<