From d4b3e20cd73159055e04d2ac977eb7b17dcdcca3 Mon Sep 17 00:00:00 2001 From: Kolfering Date: Sat, 7 Jan 2023 21:55:34 +0100 Subject: [PATCH] Make VS Solution for ShapeFusion with vcpkg --- Resources/shapefusion.rc | 4 +- Shapes/ShapesElements.cpp | 9 +- Shapes/ShapesView.cpp | 2 +- VisualStudio/.gitignore | 6 + VisualStudio/ShapesFusion.sln | 31 +++ VisualStudio/ShapesFusion.vcxproj | 247 ++++++++++++++++++++++ VisualStudio/ShapesFusion.vcxproj.filters | 199 +++++++++++++++++ VisualStudio/vcpkg.json | 15 ++ 8 files changed, 506 insertions(+), 7 deletions(-) create mode 100644 VisualStudio/.gitignore create mode 100644 VisualStudio/ShapesFusion.sln create mode 100644 VisualStudio/ShapesFusion.vcxproj create mode 100644 VisualStudio/ShapesFusion.vcxproj.filters create mode 100644 VisualStudio/vcpkg.json diff --git a/Resources/shapefusion.rc b/Resources/shapefusion.rc index 672ce4e..34c0fa7 100644 --- a/Resources/shapefusion.rc +++ b/Resources/shapefusion.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO -FILEVERSION 0, 5, 0, 0 -PRODUCTVERSION 0, 5, 0, 0 +FILEVERSION 0, 7, 0, 0 +PRODUCTVERSION 0, 7, 0, 0 FILEFLAGSMASK 0 FILEOS 0x40000 FILETYPE 1 diff --git a/Shapes/ShapesElements.cpp b/Shapes/ShapesElements.cpp index 57ba43b..8f9f112 100644 --- a/Shapes/ShapesElements.cpp +++ b/Shapes/ShapesElements.cpp @@ -1336,11 +1336,12 @@ BigEndianBuffer& ShapesChunk::SaveObject(BigEndianBuffer& buffer) sequence_count = SequenceCount(), i; long sequence_table_offset, - sequence_offsets[sequence_count], frame_table_offset, - frame_offsets[frame_count], - bitmap_table_offset, - bitmap_offsets[bitmap_count]; + bitmap_table_offset; + + std::vector sequence_offsets(sequence_count); + std::vector frame_offsets(frame_count); + std::vector bitmap_offsets(bitmap_count); // skip the collection definition, we'll fill it at the end buffer.Position(SIZEOF_collection_definition); diff --git a/Shapes/ShapesView.cpp b/Shapes/ShapesView.cpp index e07bcec..db1c521 100644 --- a/Shapes/ShapesView.cpp +++ b/Shapes/ShapesView.cpp @@ -1950,7 +1950,7 @@ void ShapesView::EditSequenceFields(wxCommandEvent &e) if (v != sel_seq->FramesPerView()) { int real_nov = ActualNumberOfViews(sel_seq->NumberOfViews()), old_fpv = sel_seq->FramesPerView(); - short old_indexes[real_nov * old_fpv]; + std::vector old_indexes(real_nov * old_fpv); for (int i = 0; i < real_nov * old_fpv; i++) old_indexes[i] = sel_seq->mFrameIndexes[i]; diff --git a/VisualStudio/.gitignore b/VisualStudio/.gitignore new file mode 100644 index 0000000..be2f120 --- /dev/null +++ b/VisualStudio/.gitignore @@ -0,0 +1,6 @@ +.vs +*.vcxproj.user +Debug/ +Release/ +x64/ +vcpkg_installed/ \ No newline at end of file diff --git a/VisualStudio/ShapesFusion.sln b/VisualStudio/ShapesFusion.sln new file mode 100644 index 0000000..e9ad462 --- /dev/null +++ b/VisualStudio/ShapesFusion.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31410.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShapesFusion", "ShapesFusion.vcxproj", "{DDD18372-3233-45FB-AFD7-8777CF441E87}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x64.ActiveCfg = Debug|x64 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x64.Build.0 = Debug|x64 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x86.ActiveCfg = Debug|Win32 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Debug|x86.Build.0 = Debug|Win32 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x64.ActiveCfg = Release|x64 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x64.Build.0 = Release|x64 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x86.ActiveCfg = Release|Win32 + {DDD18372-3233-45FB-AFD7-8777CF441E87}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B1D98722-2F72-4980-BEE1-1F0BD5FD48E8} + EndGlobalSection +EndGlobal diff --git a/VisualStudio/ShapesFusion.vcxproj b/VisualStudio/ShapesFusion.vcxproj new file mode 100644 index 0000000..1370d5b --- /dev/null +++ b/VisualStudio/ShapesFusion.vcxproj @@ -0,0 +1,247 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {ddd18372-3233-45fb-afd7-8777cf441e87} + ShapesFusion + 10.0 + + + + Application + true + v142 + v143 + Unicode + + + Application + false + v142 + v143 + Unicode + + + Application + true + v142 + v143 + Unicode + + + Application + false + v142 + v143 + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + true + + + true + + + true + + + true + + + true + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories) + 4996 + MultiThreadedDebug + true + + + Windows + true + Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.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) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + $(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories) + MultiThreaded + 4996 + + + Windows + true + true + true + Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.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) + + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + $(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories) + 4996 + MultiThreadedDebug + + + Windows + true + Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.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) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + $(ProjectDir)..\Physics;$(ProjectDir)..\Sounds;$(ProjectDir)..\Shapes;%(AdditionalIncludeDirectories) + MultiThreaded + 4996 + + + Windows + true + true + true + Rpcrt4.lib;ws2_32.lib;Strmiids.lib;mfuuid.lib;mfplat.lib;imm32.lib;Setupapi.lib;Iphlpapi.lib;Version.lib;winmm.lib;wldap32.lib;crypt32.lib;Secur32.lib;dsound.lib;comctl32.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) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualStudio/ShapesFusion.vcxproj.filters b/VisualStudio/ShapesFusion.vcxproj.filters new file mode 100644 index 0000000..dd8b3d9 --- /dev/null +++ b/VisualStudio/ShapesFusion.vcxproj.filters @@ -0,0 +1,199 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header 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 + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/VisualStudio/vcpkg.json b/VisualStudio/vcpkg.json new file mode 100644 index 0000000..1b36eb5 --- /dev/null +++ b/VisualStudio/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name":"shapefusion", + "version-date":"2020-08-17", + "dependencies":[ + { + "name":"wxwidgets", + "version>=":"3.1.5#2" + }, + { + "name":"libsndfile", + "version>=":"1.0.31" + } + ], + "builtin-baseline":"08214e18eeb146542944067c35d77faca8962be5" +} \ No newline at end of file