From 3f0a5adf947f841a14d252f43a9f683f7f6587e6 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 14 May 2015 12:37:15 +0000 Subject: [PATCH] Added project files for the Windows wx gui build. Requires CMake in the path. --- project/vs2010_mfc/VBA-M-SDL.vcxproj | 2 +- project/vs2010_mfc/VBA-M-WX.vcxproj | 450 +++++++++++++++++++ project/vs2010_mfc/VBA-M-WX.vcxproj.filters | 256 +++++++++++ project/vs2010_mfc/VBA2010.sln | 215 ++++++++- project/vs2013_mfc/VBA-M-WX.vcxproj | 454 ++++++++++++++++++++ project/vs2013_mfc/VBA-M-WX.vcxproj.filters | 256 +++++++++++ project/vs2013_mfc/VBA2013.sln | 190 +++++++- src/wx/pre-build.cmd | 7 + 8 files changed, 1824 insertions(+), 6 deletions(-) create mode 100644 project/vs2010_mfc/VBA-M-WX.vcxproj create mode 100644 project/vs2010_mfc/VBA-M-WX.vcxproj.filters create mode 100644 project/vs2013_mfc/VBA-M-WX.vcxproj create mode 100644 project/vs2013_mfc/VBA-M-WX.vcxproj.filters create mode 100644 src/wx/pre-build.cmd diff --git a/project/vs2010_mfc/VBA-M-SDL.vcxproj b/project/vs2010_mfc/VBA-M-SDL.vcxproj index 016926b6..d25d3a31 100644 --- a/project/vs2010_mfc/VBA-M-SDL.vcxproj +++ b/project/vs2010_mfc/VBA-M-SDL.vcxproj @@ -109,7 +109,7 @@ AnySuitable Speed ..\..\src;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) - NO_OAL;WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) StreamingSIMDExtensions Fast diff --git a/project/vs2010_mfc/VBA-M-WX.vcxproj b/project/vs2010_mfc/VBA-M-WX.vcxproj new file mode 100644 index 00000000..70bb1c65 --- /dev/null +++ b/project/vs2010_mfc/VBA-M-WX.vcxproj @@ -0,0 +1,450 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + VisualBoyAdvance-M-WX + {853D1FD7-20AB-586C-9699-9680F84AC985} + + + + Application + false + Unicode + + + Application + false + Unicode + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + true + true + $(ProjectDir)$(Platform)\$(Configuration)\Binary\ + $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\ + ..\..\..\dependencies\openal-soft\include\AL\;$(DXSDK_DIR)\Include;$(IncludePath) + false + + + $(ProjectDir)$(Platform)\$(Configuration)\Binary\ + $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\ + true + ..\..\..\dependencies\openal-soft\include\AL\;$(DXSDK_DIR)\Include;$(IncludePath) + + + vc_mswud_x64\ + vc_mswud_x64\minimal\ + true + true + + + vc_mswu_x64\ + vc_mswu_x64\minimal\ + false + true + + + + + ..\..\src\wx\pre-build.cmd + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + ..\..\src;..\..\..\dependencies\wxWidgets\lib\vc_lib\mswud;..\..\src\wx\widgets;..\..\..\dependencies\wxWidgets\include;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) + __WXMSW__;NO_CAIRO;NO_FFMPEG;WIN32;_WINDOWS;_DEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + false + true + EnableFastChecks + false + MultiThreadedDebugDLL + false + NotSet + + + EditAndContinue + true + false + true + Level3 + + + + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(IntDir)$(TargetName).pdb + Windows + MachineX86 + dsound.lib;comctl32.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + vc_mswud\minimal_vc9.bsc + true + + + ..\..\..\dependencies\wxwidgets\include + + + + + + ..\..\src\wx\pre-build.cmd + + + _DEBUG;%(PreprocessorDefinitions) + false + + + AnySuitable + Speed + ..\..\src;..\..\..\dependencies\wxWidgets\lib\vc_lib\mswu;..\..\src\wx\widgets;..\..\..\dependencies\wxWidgets\include;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) + __WXMSW__;NO_CAIRO;NO_FFMPEG;WIN32;_WINDOWS;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + Fast + + + true + true + true + true + Level3 + true + true + MultiThreadedDLL + true + StreamingSIMDExtensions + + + + + + Windows + true + true + + + false + $(OutDir)$(TargetName)$(TargetExt) + $(IntDir)$(TargetName).pdb + dsound.lib;comctl32.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + 1 + + + + $(IntDir)$(ProjectName)_BuildLog.htm + + + ..\..\..\dependencies\wxwidgets\include + + + + + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + .\..\..\lib\vc_x64_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + .\..\..\lib\vc_x64_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + vc_mswud_x64\minimal\ + vc_mswud_x64\minimal.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + 0x0409 + .\..\..\lib\vc_x64_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + wxmsw30ud_core.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;wininet.lib;%(AdditionalDependencies) + vc_mswud_x64\minimal.exe + true + .\..\..\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + true + vc_mswud_x64\minimal.pdb + Windows + MachineX64 + + + vc_mswud_x64\minimal_vc9.bsc + true + + + + + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + .\..\..\lib\vc_x64_lib\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + .\..\..\lib\vc_x64_lib\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + vc_mswu_x64\minimal\ + vc_mswu_x64\minimal.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + 0x0409 + .\..\..\lib\vc_x64_lib\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + wxmsw30u_core.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;wininet.lib;%(AdditionalDependencies) + vc_mswu_x64\minimal.exe + true + .\..\..\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + true + vc_mswu_x64\minimal.pdb + Windows + MachineX64 + true + true + + + vc_mswu_x64\minimal_vc9.bsc + true + + + + + {0008960e-e0dd-41a6-8265-00b31ddb4c21} + + + {81ce8daf-ebb2-4761-8e45-b71abcca8c68} + + + {24c45343-fd20-5c92-81c1-35a2ae841e79} + + + {a16d3832-0f42-57ce-8f48-50e06649ade8} + + + {3fcc50c2-81e9-5db2-b8d8-2129427568b1} + + + {6744dad8-9c70-574a-bff2-9f8dddb24a75} + + + {da8b15ef-6750-5928-bc0e-c748213cf9b2} + + + {33cc42f9-7756-5587-863c-8d4461b7c5dd} + + + {69f2ede4-7d21-5738-9bc0-f66f61c9ae00} + + + {97fdab45-9c58-5bc5-a2f4-ee42739ebc63} + + + {e21129e0-7c08-5936-9d8c-0d60b5319ba7} + + + {87b42a9c-3f5c-53d7-9017-2b1cae39457d} + + + {7fb0902d-8579-5dce-b883-daf66a885005} + + + {23e1c437-a951-5943-8639-a17f3cf2e606} + + + {a8e8442a-078a-5fc5-b495-8d71ba77ee6e} + + + {a1a8355b-0988-528e-9cc2-b971d6266669} + + + {6053cc38-cdee-584c-8bc8-4b000d800fc7} + + + {8acc122a-ca6a-5aa6-9c97-9cdd2e533db0} + + + {56a4b526-bb81-5d01-aaa9-16d23bbb169d} + + + {74827ebd-93dc-5110-ba95-3f2ab029b6b0} + + + {75596ce6-5ae7-55c9-b890-c07b0a657a83} + + + {8b867186-a0b5-5479-b824-e176edd27c40} + + + {3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6} + + + {09f2f96a-1cc6-5e43-af1d-956ec2a4888d} + + + {6d4c5ec8-933f-4c05-a1bf-498e658576df} + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + __DJGPP__ + true + 1 + __DJGPP__ + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/vs2010_mfc/VBA-M-WX.vcxproj.filters b/project/vs2010_mfc/VBA-M-WX.vcxproj.filters new file mode 100644 index 00000000..3cb5790f --- /dev/null +++ b/project/vs2010_mfc/VBA-M-WX.vcxproj.filters @@ -0,0 +1,256 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {3ff8d06f-8883-485d-a0c2-9727ca7e4e95} + + + {51092af4-ae39-4e3b-948a-94a586309418} + + + {7de46f7c-4a41-4045-b8bc-2f04734aae1a} + + + {5d0a37bf-0c6f-4042-924b-d54efa88a85d} + + + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\xBRZ + + + Pixel Filter\xBRZ + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter\HQ + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\xBRZ + + + Pixel Filter\xBRZ + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\xBRZ + + + Pixel Filter\xBRZ + + + + + Resource Files + + + + + Pixel Filter\HQ\3x_4x_asm + + + + + Pixel Filter + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\HQ\3x_4x_asm + + + \ No newline at end of file diff --git a/project/vs2010_mfc/VBA2010.sln b/project/vs2010_mfc/VBA2010.sln index 8e8bf491..c9c20802 100644 --- a/project/vs2010_mfc/VBA2010.sln +++ b/project/vs2010_mfc/VBA2010.sln @@ -18,12 +18,98 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "..\..\..\depende EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M", "VBA-M-MFC.vcxproj", "{B16AEF99-BFAB-4F85-BFE0-732524926C60}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wx", "wx", "{1B59202A-8BC2-4493-AC7A-7041E8F572DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_xml.vcxproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_xrc.vcxproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M-WX", "VBA-M-WX.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}" + ProjectSection(ProjectDependencies) = postProject + {FE52E435-A7EF-4576-AFA8-41DB45035834} = {FE52E435-A7EF-4576-AFA8-41DB45035834} + {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} + {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} + {823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4} + {7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0} + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + {F37084CC-8FC4-59F4-B769-CDFF8A384B67} = {F37084CC-8FC4-59F4-B769-CDFF8A384B67} + {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {75596CE6-5AE7-55C9-B890-C07B0A657A83} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2c", "..\..\..\dependencies\bin2c\vs2010\bin2c.vcxproj", "{FE52E435-A7EF-4576-AFA8-41DB45035834}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_gl.vcxproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_html.vcxproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_net.vcxproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxexpat.vcxproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxjpeg.vcxproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxpng.vcxproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M-SDL", "VBA-M-SDL.vcxproj", "{E269FC02-8378-49CB-91F2-A092ACDD0123}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "..\..\..\dependencies\sdl2\VisualC\SDL\SDL_VS2010.vcxproj", "{D9599786-125B-4554-8B10-DB472A8BAC48}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\dependencies\sdl2\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{628BE74B-B3DD-45EF-B820-A239E35CAC4E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxrc", "..\..\..\dependencies\wxwidgets\utils\wxrc\wxrc_vs2010.vcxproj", "{F37084CC-8FC4-59F4-B769-CDFF8A384B67}" + ProjectSection(ProjectDependencies) = postProject + {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D} + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} = {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} + {7FB0902D-8579-5DCE-B883-DAF66A885005} = {7FB0902D-8579-5DCE-B883-DAF66A885005} + {A16D3832-0F42-57CE-8F48-50E06649ADE8} = {A16D3832-0F42-57CE-8F48-50E06649ADE8} + {23E1C437-A951-5943-8639-A17F3CF2E606} = {23E1C437-A951-5943-8639-A17F3CF2E606} + {6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {6053CC38-CDEE-584C-8BC8-4B000D800FC7} + {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} = {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} + {A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669} + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} = {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} + {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} + {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {74827EBD-93DC-5110-BA95-3F2AB029B6B0} + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} + {E21129E0-7C08-5936-9D8C-0D60B5319BA7} = {E21129E0-7C08-5936-9D8C-0D60B5319BA7} + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} = {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} + {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {75596CE6-5AE7-55C9-B890-C07B0A657A83} + {DA8B15EF-6750-5928-BC0E-C748213CF9B2} = {DA8B15EF-6750-5928-BC0E-C748213CF9B2} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxtiff.vcxproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc10_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -62,18 +148,114 @@ Global {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Debug|Win32.Build.0 = Debug|Win32 {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Release|Win32.ActiveCfg = Release|Win32 {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Release|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = Debug|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = Debug|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = Release|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = Release|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Debug|Win32.Build.0 = Debug|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Release|Win32.ActiveCfg = Release|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Release|Win32.Build.0 = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 {E269FC02-8378-49CB-91F2-A092ACDD0123}.Debug|Win32.ActiveCfg = Debug|Win32 {E269FC02-8378-49CB-91F2-A092ACDD0123}.Debug|Win32.Build.0 = Debug|Win32 {E269FC02-8378-49CB-91F2-A092ACDD0123}.Release|Win32.ActiveCfg = Release|Win32 {E269FC02-8378-49CB-91F2-A092ACDD0123}.Release|Win32.Build.0 = Release|Win32 {D9599786-125B-4554-8B10-DB472A8BAC48}.Debug|Win32.ActiveCfg = Debug|Win32 - {D9599786-125B-4554-8B10-DB472A8BAC48}.Debug|Win32.Build.0 = Debug|Win32 {D9599786-125B-4554-8B10-DB472A8BAC48}.Release|Win32.ActiveCfg = Release|Win32 - {D9599786-125B-4554-8B10-DB472A8BAC48}.Release|Win32.Build.0 = Release|Win32 {628BE74B-B3DD-45EF-B820-A239E35CAC4E}.Debug|Win32.ActiveCfg = Debug|Win32 - {628BE74B-B3DD-45EF-B820-A239E35CAC4E}.Debug|Win32.Build.0 = Debug|Win32 {628BE74B-B3DD-45EF-B820-A239E35CAC4E}.Release|Win32.ActiveCfg = Release|Win32 - {628BE74B-B3DD-45EF-B820-A239E35CAC4E}.Release|Win32.Build.0 = Release|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Debug|Win32.ActiveCfg = Debug|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Debug|Win32.Build.0 = Debug|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Release|Win32.ActiveCfg = Release|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Release|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -85,7 +267,32 @@ Global {7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {8B814174-883E-43D0-969E-3A17D8EDE080} {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {8B814174-883E-43D0-969E-3A17D8EDE080} {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {1B59202A-8BC2-4493-AC7A-7041E8F572DE} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {FE52E435-A7EF-4576-AFA8-41DB45035834} = {8B814174-883E-43D0-969E-3A17D8EDE080} {D9599786-125B-4554-8B10-DB472A8BAC48} = {8B814174-883E-43D0-969E-3A17D8EDE080} {628BE74B-B3DD-45EF-B820-A239E35CAC4E} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {24C45343-FD20-5C92-81C1-35A2AE841E79} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {A16D3832-0F42-57CE-8F48-50E06649ADE8} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {7FB0902D-8579-5DCE-B883-DAF66A885005} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {DA8B15EF-6750-5928-BC0E-C748213CF9B2} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {E21129E0-7C08-5936-9D8C-0D60B5319BA7} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {23E1C437-A951-5943-8639-A17F3CF2E606} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {A1A8355B-0988-528E-9CC2-B971D6266669} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {F37084CC-8FC4-59F4-B769-CDFF8A384B67} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {8B867186-A0B5-5479-B824-E176EDD27C40} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} EndGlobalSection EndGlobal diff --git a/project/vs2013_mfc/VBA-M-WX.vcxproj b/project/vs2013_mfc/VBA-M-WX.vcxproj new file mode 100644 index 00000000..b616d900 --- /dev/null +++ b/project/vs2013_mfc/VBA-M-WX.vcxproj @@ -0,0 +1,454 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + VisualBoyAdvance-M-WX + {853D1FD7-20AB-586C-9699-9680F84AC985} + + + + Application + v120 + false + Unicode + + + Application + v120 + false + Unicode + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + true + true + $(ProjectDir)$(Platform)\$(Configuration)\Binary\ + $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\ + ..\..\..\dependencies\openal-soft\include\AL;$(VC_IncludePath);$(DXSDK_DIR)\Include;$(WindowsSDK_IncludePath) + false + + + $(ProjectDir)$(Platform)\$(Configuration)\Binary\ + $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\ + false + true + ..\..\..\dependencies\openal-soft\include\AL;$(VC_IncludePath);$(DXSDK_DIR)\Include;$(WindowsSDK_IncludePath) + + + vc_mswud_x64\ + vc_mswud_x64\minimal\ + true + true + + + vc_mswu_x64\ + vc_mswu_x64\minimal\ + false + true + + + + + ..\..\src\wx\pre-build.cmd + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + ..\..\src;..\..\..\dependencies\wxWidgets\lib\vc_lib\mswud;..\..\src\wx\widgets;..\..\..\dependencies\wxWidgets\include;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) + __WXMSW__;NO_CAIRO;NO_FFMPEG;WIN32;_WINDOWS;_DEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + false + true + EnableFastChecks + false + MultiThreadedDebugDLL + false + NotSet + + + Level3 + EditAndContinue + true + false + true + + + + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(IntDir)$(TargetName).pdb + Windows + MachineX86 + dsound.lib;comctl32.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + vc_mswud\minimal_vc9.bsc + true + + + ..\..\..\dependencies\wxwidgets\include + + + + + + ..\..\src\wx\pre-build.cmd + + + _DEBUG;%(PreprocessorDefinitions) + false + + + AnySuitable + Speed + ..\..\src;..\..\..\dependencies\wxWidgets\lib\vc_lib\mswu;..\..\src\wx\widgets;..\..\..\dependencies\wxWidgets\include;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories) + __WXMSW__;NO_CAIRO;NO_FFMPEG;WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + StreamingSIMDExtensions + Fast + + + true + true + true + true + Level3 + true + true + MultiThreadedDLL + + + + + + Windows + true + true + + + false + $(OutDir)$(TargetName)$(TargetExt) + $(IntDir)$(TargetName).pdb + dsound.lib;comctl32.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + 1 + + + + $(IntDir)$(ProjectName)_BuildLog.htm + + + ..\..\..\dependencies\wxwidgets\include + + + + + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + .\..\..\lib\vc_x64_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + .\..\..\lib\vc_x64_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + vc_mswud_x64\minimal\ + vc_mswud_x64\minimal.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + 0x0409 + .\..\..\lib\vc_x64_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + wxmsw30ud_core.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;wininet.lib;%(AdditionalDependencies) + vc_mswud_x64\minimal.exe + true + .\..\..\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + true + vc_mswud_x64\minimal.pdb + Windows + MachineX64 + + + vc_mswud_x64\minimal_vc9.bsc + true + + + + + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + .\..\..\lib\vc_x64_lib\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + .\..\..\lib\vc_x64_lib\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + vc_mswu_x64\minimal\ + vc_mswu_x64\minimal.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions) + 0x0409 + .\..\..\lib\vc_x64_lib\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories) + + + wxmsw30u_core.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;wininet.lib;%(AdditionalDependencies) + vc_mswu_x64\minimal.exe + true + .\..\..\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + true + vc_mswu_x64\minimal.pdb + Windows + MachineX64 + true + true + + + vc_mswu_x64\minimal_vc9.bsc + true + + + + + {0008960e-e0dd-41a6-8265-00b31ddb4c21} + + + {81ce8daf-ebb2-4761-8e45-b71abcca8c68} + + + {24c45343-fd20-5c92-81c1-35a2ae841e79} + + + {a16d3832-0f42-57ce-8f48-50e06649ade8} + + + {3fcc50c2-81e9-5db2-b8d8-2129427568b1} + + + {6744dad8-9c70-574a-bff2-9f8dddb24a75} + + + {01f4ce10-2cfb-41a8-b41f-e54337868a1d} + + + {da8b15ef-6750-5928-bc0e-c748213cf9b2} + + + {33cc42f9-7756-5587-863c-8d4461b7c5dd} + + + {69f2ede4-7d21-5738-9bc0-f66f61c9ae00} + + + {97fdab45-9c58-5bc5-a2f4-ee42739ebc63} + + + {e21129e0-7c08-5936-9d8c-0d60b5319ba7} + + + {87b42a9c-3f5c-53d7-9017-2b1cae39457d} + + + {7fb0902d-8579-5dce-b883-daf66a885005} + + + {23e1c437-a951-5943-8639-a17f3cf2e606} + + + {a8e8442a-078a-5fc5-b495-8d71ba77ee6e} + + + {a1a8355b-0988-528e-9cc2-b971d6266669} + + + {6053cc38-cdee-584c-8bc8-4b000d800fc7} + + + {8acc122a-ca6a-5aa6-9c97-9cdd2e533db0} + + + {56a4b526-bb81-5d01-aaa9-16d23bbb169d} + + + {74827ebd-93dc-5110-ba95-3f2ab029b6b0} + + + {75596ce6-5ae7-55c9-b890-c07b0a657a83} + + + {8b867186-a0b5-5479-b824-e176edd27c40} + + + {3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6} + + + {09f2f96a-1cc6-5e43-af1d-956ec2a4888d} + + + {6d4c5ec8-933f-4c05-a1bf-498e658576df} + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + __DJGPP__ + true + 1 + __DJGPP__ + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + 1 + ../../src/filters/hq/asm/ + true + true + 1 + ../../src/filters/hq/asm/ + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/vs2013_mfc/VBA-M-WX.vcxproj.filters b/project/vs2013_mfc/VBA-M-WX.vcxproj.filters new file mode 100644 index 00000000..3cb5790f --- /dev/null +++ b/project/vs2013_mfc/VBA-M-WX.vcxproj.filters @@ -0,0 +1,256 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {3ff8d06f-8883-485d-a0c2-9727ca7e4e95} + + + {51092af4-ae39-4e3b-948a-94a586309418} + + + {7de46f7c-4a41-4045-b8bc-2f04734aae1a} + + + {5d0a37bf-0c6f-4042-924b-d54efa88a85d} + + + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\xBRZ + + + Pixel Filter\xBRZ + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter\HQ + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\xBRZ + + + Pixel Filter\xBRZ + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\xBRZ + + + Pixel Filter\xBRZ + + + + + Resource Files + + + + + Pixel Filter\HQ\3x_4x_asm + + + + + Pixel Filter + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter\HQ\3x_4x_asm + + + \ No newline at end of file diff --git a/project/vs2013_mfc/VBA2013.sln b/project/vs2013_mfc/VBA2013.sln index 3a2c5196..63f78204 100644 --- a/project/vs2013_mfc/VBA2013.sln +++ b/project/vs2013_mfc/VBA2013.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 @@ -31,6 +30,65 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "..\..\..\dependencie EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "..\..\..\dependencies\sdl\vs2013\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wx", "wx", "{1B59202A-8BC2-4493-AC7A-7041E8F572DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_xml.vcxproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_xrc.vcxproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M-WX", "VBA-M-WX.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}" + ProjectSection(ProjectDependencies) = postProject + {FE52E435-A7EF-4576-AFA8-41DB45035834} = {FE52E435-A7EF-4576-AFA8-41DB45035834} + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + {F37084CC-8FC4-59F4-B769-CDFF8A384B67} = {F37084CC-8FC4-59F4-B769-CDFF8A384B67} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2c", "..\..\..\dependencies\bin2c\vs2013\bin2c.vcxproj", "{FE52E435-A7EF-4576-AFA8-41DB45035834}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxrc", "..\..\..\dependencies\wxwidgets\utils\wxrc\wxrc_vc9.vcxproj", "{F37084CC-8FC4-59F4-B769-CDFF8A384B67}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_gl.vcxproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_html.vcxproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_net.vcxproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxexpat.vcxproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxjpeg.vcxproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxpng.vcxproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxtiff.vcxproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\..\dependencies\wxwidgets\build\msw\wx_vc12_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "..\..\..\dependencies\sdl2\VisualC\SDL\SDL_VS2013.vcxproj", "{680B6B6E-D55A-4B7B-AEC8-3838854F1802}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\dependencies\sdl2\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{6A964F2F-2D24-431E-B4BF-38A9D40E5DE5}" @@ -77,6 +135,110 @@ Global {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|Win32.ActiveCfg = Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|Win32.Build.0 = Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|Win32.ActiveCfg = Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = Debug|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = Debug|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = Release|Win32 + {853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = Release|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Debug|Win32.Build.0 = Debug|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Release|Win32.ActiveCfg = Release|Win32 + {FE52E435-A7EF-4576-AFA8-41DB45035834}.Release|Win32.Build.0 = Release|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Debug|Win32.ActiveCfg = Debug|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Debug|Win32.Build.0 = Debug|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Release|Win32.ActiveCfg = Release|Win32 + {F37084CC-8FC4-59F4-B769-CDFF8A384B67}.Release|Win32.Build.0 = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 {680B6B6E-D55A-4B7B-AEC8-3838854F1802}.Debug|Win32.ActiveCfg = Debug|Win32 {680B6B6E-D55A-4B7B-AEC8-3838854F1802}.Debug|Win32.Build.0 = Debug|Win32 {680B6B6E-D55A-4B7B-AEC8-3838854F1802}.Release|Win32.ActiveCfg = Release|Win32 @@ -96,6 +258,32 @@ Global {7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {8B814174-883E-43D0-969E-3A17D8EDE080} {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {8B814174-883E-43D0-969E-3A17D8EDE080} {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {1B59202A-8BC2-4493-AC7A-7041E8F572DE} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {24C45343-FD20-5C92-81C1-35A2AE841E79} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {A16D3832-0F42-57CE-8F48-50E06649ADE8} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {7FB0902D-8579-5DCE-B883-DAF66A885005} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {FE52E435-A7EF-4576-AFA8-41DB45035834} = {8B814174-883E-43D0-969E-3A17D8EDE080} + {F37084CC-8FC4-59F4-B769-CDFF8A384B67} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {DA8B15EF-6750-5928-BC0E-C748213CF9B2} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {E21129E0-7C08-5936-9D8C-0D60B5319BA7} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {23E1C437-A951-5943-8639-A17F3CF2E606} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {A1A8355B-0988-528E-9CC2-B971D6266669} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} + {8B867186-A0B5-5479-B824-E176EDD27C40} = {1B59202A-8BC2-4493-AC7A-7041E8F572DE} {680B6B6E-D55A-4B7B-AEC8-3838854F1802} = {8B814174-883E-43D0-969E-3A17D8EDE080} {6A964F2F-2D24-431E-B4BF-38A9D40E5DE5} = {8B814174-883E-43D0-969E-3A17D8EDE080} EndGlobalSection diff --git a/src/wx/pre-build.cmd b/src/wx/pre-build.cmd new file mode 100644 index 00000000..30f76722 --- /dev/null +++ b/src/wx/pre-build.cmd @@ -0,0 +1,7 @@ +cd ..\..\src\wx +cmake.exe -P copy-events.cmake +..\..\..\dependencies\wxrc xrc\*.xrc -o wxvbam.xrs +..\..\..\dependencies\bin2c wxvbam.xrs builtin-xrc.h builtin_xrs +..\..\..\dependencies\bin2c ../vba-over.ini builtin-over.h builtin_over +..\..\..\dependencies\SubWCRev\SubWCRev.exe ..\..\.. ..\..\..\dependencies\SubWCRev\svnrev_template.h ..\svnrev.h +exit 0