From: <sie...@us...> - 2013-11-22 03:25:56
|
Revision: 5335 http://sourceforge.net/p/moneymanagerex/code/5335 Author: siena123 Date: 2013-11-22 03:25:51 +0000 (Fri, 22 Nov 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/build/bakefiles/common.bkl trunk/build/bakefiles/config.bkl trunk/build/bakefiles/mmex_tests.bkl trunk/build/msw/makefile.gcc trunk/build/msw/makefile.vc trunk/build/msw/mmex_mmex.vcproj trunk/build/msw/tests/makefile.gcc 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-21 13:11:16 UTC (rev 5334) +++ trunk/build/bakefiles/common.bkl 2013-11-22 03:25:51 UTC (rev 5335) @@ -161,7 +161,7 @@ <!-- prepend valid lib-path to x64 libs (\lib\vc_amd64_lib) --> - <lib-path> + <lib-path prepend="1"> $(nativePaths(WX_DIR) + '\lib' + DIRSEP + COMPILER + CPU_SUF + LIB_SUF) </lib-path> @@ -172,7 +172,7 @@ <!-- common part of mmex and mmex_tests --> - <template id="mmex_common" template="lib_path_x64_hack,wx,compiler_common"> + <template id="mmex_common" template="wx,lib_path_x64_hack,compiler_common"> <cxx-exceptions>on</cxx-exceptions> <cxx-rtti>on</cxx-rtti> @@ -193,7 +193,6 @@ <set var="PLATF_DIR"> <if cond="TOOLSET=='win32'">win</if> - <if cond="TOOLSET=='win64'">win</if> <if cond="TOOLSET=='unix'">unix</if> <if cond="1">/mac</if> </set> Modified: trunk/build/bakefiles/config.bkl =================================================================== --- trunk/build/bakefiles/config.bkl 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/bakefiles/config.bkl 2013-11-22 03:25:51 UTC (rev 5335) @@ -483,12 +483,6 @@ <if cond="TOOLKIT=='MSW'">msw</if> <if cond="TOOLKIT=='GTK'">gtk</if> </set> - <set var="WIN64_TOOLKIT"> - <if cond="TOOLKIT=='MSW'">MSW</if> - </set> - <set var="WIN64_TOOLKIT_LOWERCASE"> - <if cond="TOOLKIT=='MSW'">msw</if> - </set> <set var="TOOLKIT" overwrite="0"> <if cond="FORMAT=='msevc4prj'">WINCE</if> @@ -496,8 +490,8 @@ <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if> <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if> <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if> - <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win64'">$(WIN64_TOOLKIT)</if> - <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win64'">$(WIN64_TOOLKIT)</if> + <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if> + <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if> <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if> <if cond="PLATFORM_OS2=='1'">PM</if> </set> @@ -507,8 +501,8 @@ <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003'">wince</if> <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if> <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if> - <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win64'">$(WIN64_TOOLKIT_LOWERCASE)</if> - <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win64'">$(WIN64_TOOLKIT_LOWERCASE)</if> + <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if> + <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if> <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if> <if cond="PLATFORM_OS2=='1'">pm</if> </set> Modified: trunk/build/bakefiles/mmex_tests.bkl =================================================================== --- trunk/build/bakefiles/mmex_tests.bkl 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/bakefiles/mmex_tests.bkl 2013-11-22 03:25:51 UTC (rev 5335) @@ -67,13 +67,11 @@ <set var="COPY"> <if cond="TOOLSET=='win32'">copy /Y</if> - <if cond="TOOLSET=='win64'">copy /Y</if> <if cond="TOOLSET=='unix'">cp</if> </set> <set var="MKDIR"> <if cond="TOOLSET=='win32'">mkdir</if> - <if cond="TOOLSET=='win64'">mkdir</if> <if cond="TOOLSET=='unix'">mkdir -p</if> </set> Modified: trunk/build/msw/makefile.gcc =================================================================== --- trunk/build/msw/makefile.gcc 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw/makefile.gcc 2013-11-22 03:25:51 UTC (rev 5335) @@ -175,12 +175,6 @@ WX3RDPARTYLIBPOSTFIX = d endif ifeq ($(WX_SHARED),0) -____mmex_LIB_SUF_FILENAMES = _lib -endif -ifeq ($(WX_SHARED),1) -____mmex_LIB_SUF_FILENAMES = _dll -endif -ifeq ($(WX_SHARED),0) ____WX_SHARED_17_p_1 = endif ifeq ($(WX_SHARED),1) @@ -192,6 +186,12 @@ ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p_2 = --define __WXDEBUG__ endif +ifeq ($(WX_SHARED),0) +____mmex_LIB_SUF_FILENAMES = _lib +endif +ifeq ($(WX_SHARED),1) +____mmex_LIB_SUF_FILENAMES = _dll +endif ifeq ($(WX_DEBUG),0) __DEBUG_DEFINE_p_3 = --define NDEBUG endif @@ -352,7 +352,7 @@ ranlib $@ mmex.exe: $(MMEX_OBJECTS) libwxsqlite.a liblua.a mmex_resources_mmex_rc.o - $(CXX) -o $@ $(MMEX_OBJECTS) -L$(WX_DIR)\lib\gcc$(____mmex_LIB_SUF_FILENAMES) -mthreads -L$(WX_DIR)$(WXLIBPATH) -mthreads $(__DEBUGINFO) -Wl,--subsystem,windows -mwindows $(LDFLAGS) libwxsqlite.a liblua.a $(__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) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MMEX_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -L$(WX_DIR)\lib\gcc$(____mmex_LIB_SUF_FILENAMES) -mthreads $(__DEBUGINFO) -Wl,--subsystem,windows -mwindows $(LDFLAGS) libwxsqlite.a liblua.a $(__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) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 install_mmex: mmex.exe -mkdir $(PREFIX)\mmex\bin Modified: trunk/build/msw/makefile.vc =================================================================== --- trunk/build/msw/makefile.vc 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw/makefile.vc 2013-11-22 03:25:51 UTC (rev 5335) @@ -221,19 +221,7 @@ !if "$(WX_SHARED)" == "1" __WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif -!if "$(TARGET_CPU)" == "AMD64" -____mmex_CPU_SUF_FILENAMES = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -____mmex_CPU_SUF_FILENAMES = _ia64 -!endif !if "$(WX_SHARED)" == "0" -____mmex_LIB_SUF_FILENAMES = _lib -!endif -!if "$(WX_SHARED)" == "1" -____mmex_LIB_SUF_FILENAMES = _dll -!endif -!if "$(WX_SHARED)" == "0" ____WX_SHARED_31_p_1 = !endif !if "$(WX_SHARED)" == "1" @@ -263,6 +251,18 @@ !if "$(WX_SHARED)" == "1" __WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif +!if "$(TARGET_CPU)" == "AMD64" +____mmex_CPU_SUF_FILENAMES = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +____mmex_CPU_SUF_FILENAMES = _ia64 +!endif +!if "$(WX_SHARED)" == "0" +____mmex_LIB_SUF_FILENAMES = _lib +!endif +!if "$(WX_SHARED)" == "1" +____mmex_LIB_SUF_FILENAMES = _dll +!endif !if "$(WX_DEBUG)" == "0" __DEBUGINFO_39 = !endif @@ -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 /SUBSYSTEM:WINDOWS,5.1 $(__mmex_LINK_FLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_CPU_SUF_FILENAMES)$(____mmex_LIB_SUF_FILENAMES) $(__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-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw/mmex_mmex.vcproj 2013-11-22 03:25:51 UTC (rev 5335) @@ -267,7 +267,7 @@ OutputFile="$(PlatformName)\$(ConfigurationName)\mmex.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;$(WXWIN)\lib\vc_x64_lib" + AdditionalLibraryDirectories="$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib" GenerateManifest="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\mmex.pdb" SubSystem="2" @@ -359,7 +359,7 @@ OutputFile="$(PlatformName)\$(ConfigurationName)\mmex.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;$(WXWIN)\lib\vc_x64_lib" + AdditionalLibraryDirectories="$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\mmex.pdb" Modified: trunk/build/msw/tests/makefile.gcc =================================================================== --- trunk/build/msw/tests/makefile.gcc 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw/tests/makefile.gcc 2013-11-22 03:25:51 UTC (rev 5335) @@ -209,12 +209,6 @@ WX3RDPARTYLIBPOSTFIX = d endif ifeq ($(WX_SHARED),0) -____mmex_tests_LIB_SUF_FILENAMES = _lib -endif -ifeq ($(WX_SHARED),1) -____mmex_tests_LIB_SUF_FILENAMES = _dll -endif -ifeq ($(WX_SHARED),0) ____WX_SHARED_26_p_1 = endif ifeq ($(WX_SHARED),1) @@ -226,6 +220,12 @@ ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p_2 = --define __WXDEBUG__ endif +ifeq ($(WX_SHARED),0) +____mmex_tests_LIB_SUF_FILENAMES = _lib +endif +ifeq ($(WX_SHARED),1) +____mmex_tests_LIB_SUF_FILENAMES = _dll +endif ifeq ($(WX_DEBUG),0) __DEBUG_DEFINE_p_4 = --define NDEBUG endif @@ -356,7 +356,7 @@ ranlib $@ mmex_tests.exe: $(MMEX_TESTS_OBJECTS) libwxsqlite.a liblua.a libcppunit.a mmex_tests_mmex_tests_rc.o - $(CXX) -o $@ $(MMEX_TESTS_OBJECTS) -L$(WX_DIR)\lib\gcc$(____mmex_tests_LIB_SUF_FILENAMES) -mthreads -L$(WX_DIR)$(WXLIBPATH) -mthreads $(__DEBUGINFO) $(LDFLAGS) libwxsqlite.a liblua.a $(__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) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 libcppunit.a + $(CXX) -o $@ $(MMEX_TESTS_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -L$(WX_DIR)\lib\gcc$(____mmex_tests_LIB_SUF_FILENAMES) -mthreads $(__DEBUGINFO) $(LDFLAGS) libwxsqlite.a liblua.a $(__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) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 libcppunit.a check: all .\mmex_tests.exe Modified: trunk/build/msw/tests/makefile.vc =================================================================== --- trunk/build/msw/tests/makefile.vc 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw/tests/makefile.vc 2013-11-22 03:25:51 UTC (rev 5335) @@ -233,19 +233,7 @@ !if "$(WX_SHARED)" == "1" __WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif -!if "$(TARGET_CPU)" == "AMD64" -____mmex_tests_CPU_SUF_FILENAMES = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -____mmex_tests_CPU_SUF_FILENAMES = _ia64 -!endif !if "$(WX_SHARED)" == "0" -____mmex_tests_LIB_SUF_FILENAMES = _lib -!endif -!if "$(WX_SHARED)" == "1" -____mmex_tests_LIB_SUF_FILENAMES = _dll -!endif -!if "$(WX_SHARED)" == "0" ____WX_SHARED_46_p_1 = !endif !if "$(WX_SHARED)" == "1" @@ -275,6 +263,18 @@ !if "$(WX_SHARED)" == "1" __WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif +!if "$(TARGET_CPU)" == "AMD64" +____mmex_tests_CPU_SUF_FILENAMES = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +____mmex_tests_CPU_SUF_FILENAMES = _ia64 +!endif +!if "$(WX_SHARED)" == "0" +____mmex_tests_LIB_SUF_FILENAMES = _lib +!endif +!if "$(WX_SHARED)" == "1" +____mmex_tests_LIB_SUF_FILENAMES = _dll +!endif !if "$(WX_DEBUG)" == "0" __DEBUGINFO_54 = !endif @@ -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 /SUBSYSTEM:WINDOWS,5.1 $(__mmex_tests_LINK_FLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) $(__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-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj 2013-11-22 03:25:51 UTC (rev 5335) @@ -267,7 +267,7 @@ OutputFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;$(WXWIN)\lib\vc_x64_lib" + AdditionalLibraryDirectories="$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib" GenerateManifest="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.pdb" SubSystem="1" @@ -359,7 +359,7 @@ OutputFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;$(WXWIN)\lib\vc_x64_lib" + AdditionalLibraryDirectories="$(WXWIN)\lib\vc_x64_lib;$(WXWIN)\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\mmex_tests.pdb" Modified: trunk/build/msw-vc-2013e/mmex_mmex.vcxproj =================================================================== --- trunk/build/msw-vc-2013e/mmex_mmex.vcxproj 2013-11-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw-vc-2013e/mmex_mmex.vcxproj 2013-11-22 03:25:51 UTC (rev 5335) @@ -196,7 +196,7 @@ <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 /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /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> @@ -237,7 +237,7 @@ <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 /SUBSYSTEM:WINDOWS,5.1 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO %(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> 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-21 13:11:16 UTC (rev 5334) +++ trunk/build/msw-vc-2013e/tests/mmex_tests_mmex_tests.vcxproj 2013-11-22 03:25:51 UTC (rev 5335) @@ -196,7 +196,7 @@ <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 /SUBSYSTEM:WINDOWS,5.1 /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO /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> @@ -237,7 +237,7 @@ <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 /SUBSYSTEM:WINDOWS,5.1 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/SAFESEH:NO %(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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |