From: <sie...@us...> - 2013-11-21 13:11:20
|
Revision: 5334 http://sourceforge.net/p/moneymanagerex/code/5334 Author: siena123 Date: 2013-11-21 13:11:16 +0000 (Thu, 21 Nov 2013) Log Message: ----------- set XP as minimum supported version Modified Paths: -------------- trunk/build/bakefiles/common.bkl trunk/build/msw/makefile.vc trunk/build/msw/mmex_mmex.vcproj trunk/build/msw/tests/makefile.vc trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj trunk/build/msw-vc-2013e/mmex_mmex.vcxproj trunk/build/msw-vc-2013e/tests/mmex_tests_mmex_tests.vcxproj Modified: trunk/build/bakefiles/common.bkl =================================================================== --- trunk/build/bakefiles/common.bkl 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/bakefiles/common.bkl 2013-11-21 13:11:16 UTC (rev 5334) @@ -129,7 +129,7 @@ <if cond="FORMAT in ['msvc', 'msvs2005prj','msvs2008prj']"> <cppflags>/D_CRT_SECURE_NO_WARNINGS</cppflags> - <ldflags>/SAFESEH:NO</ldflags> + <ldflags>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1</ldflags> </if> </template> Modified: trunk/build/msw/makefile.vc =================================================================== --- trunk/build/msw/makefile.vc 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/msw/makefile.vc 2013-11-21 13:11:16 UTC (rev 5334) @@ -478,7 +478,7 @@ << mmex.exe: $(MMEX_OBJECTS) wxsqlite.lib lua.lib mmex_resources_mmex.res - link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_CPU_SUF_FILENAMES)$(____mmex_LIB_SUF_FILENAMES) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) $(__DEBUGINFO_39) /pdb:"mmex.pdb" $(__DEBUGINFO_43) /SAFESEH:NO $(__mmex_LINK_FLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_CPU_SUF_FILENAMES)$(____mmex_LIB_SUF_FILENAMES) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) $(__DEBUGINFO_39) /pdb:"mmex.pdb" $(__DEBUGINFO_43) /SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 $(__mmex_LINK_FLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MMEX_OBJECTS) $(MMEX_RESOURCES) wxsqlite.lib lua.lib $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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 << mt.exe -manifest ".\mmex.exe.manifest" -outputresource:".\mmex.exe";1 Modified: trunk/build/msw/mmex_mmex.vcproj =================================================================== --- trunk/build/msw/mmex_mmex.vcproj 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/msw/mmex_mmex.vcproj 2013-11-21 13:11:16 UTC (rev 5334) @@ -79,7 +79,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30u_core.lib wxmsw30u_qa.lib wxbase30u_net.lib wxmsw30u_html.lib wxbase30u_xml.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex.exe" LinkIncremental="1" @@ -171,7 +171,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30ud_core.lib wxmsw30ud_qa.lib wxbase30ud_net.lib wxmsw30ud_html.lib wxbase30ud_xml.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex.exe" LinkIncremental="2" @@ -262,7 +262,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30u_core.lib wxmsw30u_qa.lib wxbase30u_net.lib wxmsw30u_html.lib wxbase30u_xml.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex.exe" LinkIncremental="1" @@ -354,7 +354,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30ud_core.lib wxmsw30ud_qa.lib wxbase30ud_net.lib wxmsw30ud_html.lib wxbase30ud_xml.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex.exe" LinkIncremental="2" Modified: trunk/build/msw/tests/makefile.vc =================================================================== --- trunk/build/msw/tests/makefile.vc 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/msw/tests/makefile.vc 2013-11-21 13:11:16 UTC (rev 5334) @@ -447,7 +447,7 @@ << mmex_tests.exe: $(MMEX_TESTS_OBJECTS) wxsqlite.lib lua.lib cppunit.lib mmex_tests_mmex_tests.res - link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) $(__DEBUGINFO_54) /pdb:"mmex_tests.pdb" $(__DEBUGINFO_58) /SAFESEH:NO $(__mmex_tests_LINK_FLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) $(__DEBUGINFO_54) /pdb:"mmex_tests.pdb" $(__DEBUGINFO_58) /SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 $(__mmex_tests_LINK_FLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(MMEX_TESTS_OBJECTS) $(MMEX_TESTS_RESOURCES) wxsqlite.lib lua.lib $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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 cppunit.lib << mt.exe -manifest ".\mmex_tests.exe.manifest" -outputresource:".\mmex_tests.exe";1 Modified: trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj =================================================================== --- trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj 2013-11-21 13:11:16 UTC (rev 5334) @@ -79,7 +79,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30u_core.lib wxmsw30u_qa.lib wxbase30u_net.lib wxmsw30u_html.lib wxbase30u_xml.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 $(PlatformName)\$(ConfigurationName)\cppunit.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.exe" LinkIncremental="1" @@ -171,7 +171,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30ud_core.lib wxmsw30ud_qa.lib wxbase30ud_net.lib wxmsw30ud_html.lib wxbase30ud_xml.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 $(PlatformName)\$(ConfigurationName)\cppunit.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.exe" LinkIncremental="2" @@ -262,7 +262,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30u_core.lib wxmsw30u_qa.lib wxbase30u_net.lib wxmsw30u_html.lib wxbase30u_xml.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 $(PlatformName)\$(ConfigurationName)\cppunit.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.exe" LinkIncremental="1" @@ -354,7 +354,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/SAFESEH:NO" + AdditionalOptions="/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1" AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib $(PlatformName)\$(ConfigurationName)\lua.lib wxmsw30ud_core.lib wxmsw30ud_qa.lib wxbase30ud_net.lib wxmsw30ud_html.lib wxbase30ud_xml.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 $(PlatformName)\$(ConfigurationName)\cppunit.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.exe" LinkIncremental="2" Modified: trunk/build/msw-vc-2013e/mmex_mmex.vcxproj =================================================================== --- trunk/build/msw-vc-2013e/mmex_mmex.vcxproj 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/msw-vc-2013e/mmex_mmex.vcxproj 2013-11-21 13:11:16 UTC (rev 5334) @@ -115,7 +115,7 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30u_core.lib;wxmsw30u_qa.lib;wxbase30u_net.lib;wxmsw30u_html.lib;wxbase30u_xml.lib;wxmsw30u_aui.lib;wxmsw30u_adv.lib;wxbase30u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;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;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -156,7 +156,7 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30ud_core.lib;wxmsw30ud_qa.lib;wxbase30ud_net.lib;wxmsw30ud_html.lib;wxbase30ud_xml.lib;wxmsw30ud_aui.lib;wxmsw30ud_adv.lib;wxbase30ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;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;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -196,11 +196,11 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30u_core.lib;wxmsw30u_qa.lib;wxbase30u_net.lib;wxmsw30u_html.lib;wxbase30u_xml.lib;wxmsw30u_aui.lib;wxmsw30u_adv.lib;wxbase30u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;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;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> - <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(Platform)\$(Configuration)\mmex.pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX64</TargetMachine> @@ -237,11 +237,11 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30ud_core.lib;wxmsw30ud_qa.lib;wxbase30ud_net.lib;wxmsw30ud_html.lib;wxbase30ud_xml.lib;wxmsw30ud_aui.lib;wxmsw30ud_adv.lib;wxbase30ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;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;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> - <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(Platform)\$(Configuration)\mmex.pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> Modified: trunk/build/msw-vc-2013e/tests/mmex_tests_mmex_tests.vcxproj =================================================================== --- trunk/build/msw-vc-2013e/tests/mmex_tests_mmex_tests.vcxproj 2013-11-20 23:14:06 UTC (rev 5333) +++ trunk/build/msw-vc-2013e/tests/mmex_tests_mmex_tests.vcxproj 2013-11-21 13:11:16 UTC (rev 5334) @@ -115,7 +115,7 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\..\lib\wxsqlite3\include;..\..\..\lib\lua\src;..\..\..\lib;..\..\..\src;..\..\..\src;..\..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30u_core.lib;wxmsw30u_qa.lib;wxbase30u_net.lib;wxmsw30u_html.lib;wxbase30u_xml.lib;wxmsw30u_aui.lib;wxmsw30u_adv.lib;wxbase30u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;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;$(Platform)\$(Configuration)\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex_tests.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -156,7 +156,7 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\..\lib\wxsqlite3\include;..\..\..\lib\lua\src;..\..\..\lib;..\..\..\src;..\..\..\src;..\..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30ud_core.lib;wxmsw30ud_qa.lib;wxbase30ud_net.lib;wxmsw30ud_html.lib;wxbase30ud_xml.lib;wxmsw30ud_aui.lib;wxmsw30ud_adv.lib;wxbase30ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;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;$(Platform)\$(Configuration)\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex_tests.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -196,11 +196,11 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\..\lib\wxsqlite3\include;..\..\..\lib\lua\src;..\..\..\lib;..\..\..\src;..\..\..\src;..\..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30u_core.lib;wxmsw30u_qa.lib;wxbase30u_net.lib;wxmsw30u_html.lib;wxbase30u_xml.lib;wxmsw30u_aui.lib;wxmsw30u_adv.lib;wxbase30u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;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;$(Platform)\$(Configuration)\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex_tests.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> - <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(Platform)\$(Configuration)\mmex_tests.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> <TargetMachine>MachineX64</TargetMachine> @@ -237,11 +237,11 @@ <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\..\lib\wxsqlite3\include;..\..\..\lib\lua\src;..\..\..\lib;..\..\..\src;..\..\..\src;..\..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /SUBSYSTEM:WINDOWS,5.1 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>$(Platform)\$(Configuration)\wxsqlite.lib;$(Platform)\$(Configuration)\lua.lib;wxmsw30ud_core.lib;wxmsw30ud_qa.lib;wxbase30ud_net.lib;wxmsw30ud_html.lib;wxbase30ud_xml.lib;wxmsw30ud_aui.lib;wxmsw30ud_adv.lib;wxbase30ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;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;$(Platform)\$(Configuration)\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(Platform)\$(Configuration)\mmex_tests.exe</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> - <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(Platform)\$(Configuration)\mmex_tests.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |