From 886bc2965d0f7fa5d30121cf28aef1265279494a Mon Sep 17 00:00:00 2001 From: Mateusz Adamczyk Date: Tue, 24 Oct 2017 20:57:31 +0200 Subject: Use unicode --- ports/atkmm/fix_charset.patch | 98 ++ ports/atkmm/portfile.cmake | 2 +- ports/glibmm/fix_charset.patch | 2702 +++++++++++++++++++++++++++++++++++++++ ports/glibmm/portfile.cmake | 2 +- ports/gtkmm/fix_charset.patch | 2053 +++++++++++++++++++++++++++++ ports/gtkmm/portfile.cmake | 14 +- ports/pangomm/fix_charset.patch | 110 ++ ports/pangomm/portfile.cmake | 2 +- 8 files changed, 4967 insertions(+), 16 deletions(-) create mode 100644 ports/atkmm/fix_charset.patch create mode 100644 ports/glibmm/fix_charset.patch create mode 100644 ports/gtkmm/fix_charset.patch create mode 100644 ports/pangomm/fix_charset.patch diff --git a/ports/atkmm/fix_charset.patch b/ports/atkmm/fix_charset.patch new file mode 100644 index 000000000..60cd8fbcd --- /dev/null +++ b/ports/atkmm/fix_charset.patch @@ -0,0 +1,98 @@ +diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj +index 40f21cb..e9f5c5e 100644 +--- a/MSVC_Net2013/atkmm.vcxproj ++++ b/MSVC_Net2013/atkmm.vcxproj +@@ -22,21 +22,22 @@ + atkmm + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + Win32Proj ++ 8.1 + + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + +diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj +index d6f2798..aab7023 100644 +--- a/MSVC_Net2013/gendef.vcxproj ++++ b/MSVC_Net2013/gendef.vcxproj +@@ -21,21 +21,22 @@ + + {07324745-C9BE-4D65-B08A-9C88188C0C28} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj +index 6225a66..7f61dc5 100644 +--- a/MSVC_Net2013/install.vcxproj ++++ b/MSVC_Net2013/install.vcxproj +@@ -22,28 +22,29 @@ + {2093D218-190E-4194-9421-3BA7CBF33B10} + install + Win32Proj ++ 8.1 + + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index 84fc6e6a0..4cbaee7ad 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) diff --git a/ports/glibmm/fix_charset.patch b/ports/glibmm/fix_charset.patch new file mode 100644 index 000000000..8831fc946 --- /dev/null +++ b/ports/glibmm/fix_charset.patch @@ -0,0 +1,2702 @@ +diff --git a/MSVC_Net2013/compose.vcxproj b/MSVC_Net2013/compose.vcxproj +index 4775af3..72a7054 100644 +--- a/MSVC_Net2013/compose.vcxproj ++++ b/MSVC_Net2013/compose.vcxproj +@@ -23,26 +23,27 @@ + {D1C74410-023C-48DE-B636-E8B6D177C306} + compose + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/dispatcher.vcxproj b/MSVC_Net2013/dispatcher.vcxproj +index 6c403c0..90d254a 100644 +--- a/MSVC_Net2013/dispatcher.vcxproj ++++ b/MSVC_Net2013/dispatcher.vcxproj +@@ -23,26 +23,27 @@ + {129ECC08-6D30-4884-B824-4AF96EF0A45C} + dispatcher + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/dispatcher2.vcxproj b/MSVC_Net2013/dispatcher2.vcxproj +index db6a5fd..9cf6b57 100644 +--- a/MSVC_Net2013/dispatcher2.vcxproj ++++ b/MSVC_Net2013/dispatcher2.vcxproj +@@ -22,26 +22,27 @@ + dispatcher2 + {18A82706-B645-4DF5-AB09-06B90128BAC5} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -188,4 +189,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj +index 8894039..0b2cb08 100644 +--- a/MSVC_Net2013/gendef.vcxproj ++++ b/MSVC_Net2013/gendef.vcxproj +@@ -1,168 +1,169 @@ +-??? +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {07324745-C9BE-4D65-B08A-9C88188C0C28} +- Win32Proj +- +- +- +- Application +- MultiByte +- v120 +- +- +- Application +- MultiByte +- v120 +- +- +- Application +- MultiByte +- v120 +- +- +- Application +- MultiByte +- v120 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- true +- true +- false +- true +- true +- true +- false +- true +- +- +- +- Disabled +- _DEBUG;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebug +- Level3 +- EditAndContinue +- +- +- true +- $(OutDir)\$(TargetName).pdb +- Console +- false +- +- +- MachineX86 ++??? ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {07324745-C9BE-4D65-B08A-9C88188C0C28} ++ Win32Proj ++ 8.1 ++ ++ ++ ++ Application ++ Unicode ++ v120 ++ ++ ++ Application ++ Unicode ++ v120 ++ ++ ++ Application ++ Unicode ++ v120 ++ ++ ++ Application ++ Unicode ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ false ++ true ++ true ++ true ++ false ++ true ++ ++ ++ ++ Disabled ++ _DEBUG;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebug ++ Level3 ++ EditAndContinue ++ ++ ++ true ++ $(OutDir)\$(TargetName).pdb ++ Console ++ false ++ ++ ++ MachineX86 + %(AdditionalDependencies) +- +- +- +- +- ;%(PreprocessorDefinitions) +- MultiThreaded +- Level3 +- ProgramDatabase +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX86 ++ ++ ++ ++ ++ ;%(PreprocessorDefinitions) ++ MultiThreaded ++ Level3 ++ ProgramDatabase ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX86 + %(AdditionalDependencies) +- +- +- +- +- X64 +- +- +- Disabled +- _DEBUG;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebug +- Level3 +- ProgramDatabase +- +- +- true +- $(OutDir)\$(TargetName).pdb +- Console +- false +- +- +- MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ _DEBUG;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebug ++ Level3 ++ ProgramDatabase ++ ++ ++ true ++ $(OutDir)\$(TargetName).pdb ++ Console ++ false ++ ++ ++ MachineX64 + %(AdditionalDependencies) +- +- +- +- +- X64 +- +- +- ;%(PreprocessorDefinitions) +- MultiThreaded +- Level3 +- ProgramDatabase +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ ;%(PreprocessorDefinitions) ++ MultiThreaded ++ Level3 ++ ProgramDatabase ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX64 + %(AdditionalDependencies) +- +- +- +- +- +- +- +- +- +\ No newline at end of file ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/giomm.vcxproj b/MSVC_Net2013/giomm.vcxproj +index df3c4f8..f9baf6b 100644 +--- a/MSVC_Net2013/giomm.vcxproj ++++ b/MSVC_Net2013/giomm.vcxproj +@@ -1,458 +1,459 @@ +-??? +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- giomm +- {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} +- +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- %(AdditionalOptions) +- Disabled ++??? ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ giomm ++ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} ++ 8.1 ++ ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ %(AdditionalOptions) ++ Disabled + .\giomm;..\gio;%(AdditionalIncludeDirectories) +- _DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- Level3 +- EditAndContinue +- +- +- Generate giomm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj +- +- ++ _DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ Level3 ++ EditAndContinue ++ ++ ++ Generate giomm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll +- $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- Disabled ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ Disabled + .\giomm;..\gio;%(AdditionalIncludeDirectories) +- _DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- Level3 +- ProgramDatabase +- +- +- Generate giomm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj +- +- ++ _DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate giomm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll +- $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- MachineX64 +- +- +- +- +- %(AdditionalOptions) ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ %(AdditionalOptions) + .\giomm;..\gio;%(AdditionalIncludeDirectories) +- $(GioMMBuildDefs);%(PreprocessorDefinitions) +- MultiThreadedDLL +- Level3 +- ProgramDatabase +- +- +- Generate giomm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj +- +- ++ $(GioMMBuildDefs);%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate giomm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll +- $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- false +- true +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb +- true +- +- +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ false ++ true ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb ++ true ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) + .\giomm;..\gio;%(AdditionalIncludeDirectories) +- $(GioMMBuildDefs);%(PreprocessorDefinitions) +- MultiThreadedDLL +- Level3 +- ProgramDatabase +- +- +- Generate giomm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj +- +- ++ $(GioMMBuildDefs);%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate giomm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll +- $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- false +- true +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb +- true +- +- +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- {58b2b53c-c4ff-47fd-817b-095e45b7f7d4} +- false +- +- +- +- +- +- +\ No newline at end of file ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ false ++ true ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb ++ true ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {58b2b53c-c4ff-47fd-817b-095e45b7f7d4} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/giomm_simple.vcxproj b/MSVC_Net2013/giomm_simple.vcxproj +index 1eb6124..2db412e 100644 +--- a/MSVC_Net2013/giomm_simple.vcxproj ++++ b/MSVC_Net2013/giomm_simple.vcxproj +@@ -23,26 +23,27 @@ + {F4F66980-51D4-4CC2-A529-9AD2C9F7D143} + tests_giomm_simple + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/glibmm.vcxproj b/MSVC_Net2013/glibmm.vcxproj +index cf86400..e3df6a8 100644 +--- a/MSVC_Net2013/glibmm.vcxproj ++++ b/MSVC_Net2013/glibmm.vcxproj +@@ -1,362 +1,363 @@ +-??? +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- glibmm +- {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} +- glibmm +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- true +- true +- true +- true +- true +- true +- true +- true +- +- +- +- %(AdditionalOptions) +- Disabled +- %(AdditionalIncludeDirectories) +- _DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- Level3 +- EditAndContinue +- +- +- Generate glibmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj +- +- ++??? ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ glibmm ++ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} ++ glibmm ++ Win32Proj ++ 8.1 ++ ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ true ++ true ++ true ++ true ++ true ++ true ++ ++ ++ ++ %(AdditionalOptions) ++ Disabled ++ %(AdditionalIncludeDirectories) ++ _DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ Level3 ++ EditAndContinue ++ ++ ++ Generate glibmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll +- $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- Disabled +- %(AdditionalIncludeDirectories) +- _DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- Level3 +- ProgramDatabase +- +- +- Generate glibmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj +- +- ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ Disabled ++ %(AdditionalIncludeDirectories) ++ _DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate glibmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll +- $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- MachineX64 +- +- +- +- +- %(AdditionalOptions) +- %(AdditionalIncludeDirectories) +- $(GLibMMBuildDefs);%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- Level3 +- ProgramDatabase +- +- +- Generate glibmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj +- +- ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(DebugDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(DebugDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ %(AdditionalOptions) ++ %(AdditionalIncludeDirectories) ++ $(GLibMMBuildDefs);%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate glibmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll +- $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- true +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb +- false +- true +- +- +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- %(AdditionalIncludeDirectories) +- $(GLibMMBuildDefs);%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- Level3 +- ProgramDatabase +- +- +- Generate glibmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj +- +- ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ true ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb ++ false ++ true ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ %(AdditionalIncludeDirectories) ++ $(GLibMMBuildDefs);%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate glibmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- %(AdditionalLibraryDirectories) +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll +- $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib +- $(IntDir)\$(ProjectName).def +- true +- $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb +- false +- true +- +- +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- {07324745-c9be-4d65-b08a-9c88188c0c28} +- false +- +- +- +- +- +- +\ No newline at end of file ++ %(AdditionalLibraryDirectories) ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll ++ $(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib ++ $(IntDir)\$(ProjectName).def ++ true ++ $(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb ++ false ++ true ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {07324745-c9be-4d65-b08a-9c88188c0c28} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/glibmm_value.vcxproj b/MSVC_Net2013/glibmm_value.vcxproj +index 9639003..7e12415 100644 +--- a/MSVC_Net2013/glibmm_value.vcxproj ++++ b/MSVC_Net2013/glibmm_value.vcxproj +@@ -23,26 +23,27 @@ + {22277003-3228-486E-A6A8-994B8B13AF30} + tests_glibmm_value + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -186,4 +187,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj +index 059ceec..b6f2843 100644 +--- a/MSVC_Net2013/install.vcxproj ++++ b/MSVC_Net2013/install.vcxproj +@@ -22,28 +22,29 @@ + {2093D218-190E-4194-9421-3BA7CBF33B10} + install + Win32Proj ++ 8.1 + + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + +@@ -113,4 +114,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/keyfile.vcxproj b/MSVC_Net2013/keyfile.vcxproj +index 0993e6a..ee23bae 100644 +--- a/MSVC_Net2013/keyfile.vcxproj ++++ b/MSVC_Net2013/keyfile.vcxproj +@@ -23,26 +23,27 @@ + {569A24AB-8D81-4427-B40D-85485AA7F3CD} + dispatcher + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/markup.vcxproj b/MSVC_Net2013/markup.vcxproj +index 03b3295..db2dfab 100644 +--- a/MSVC_Net2013/markup.vcxproj ++++ b/MSVC_Net2013/markup.vcxproj +@@ -22,26 +22,27 @@ + markup + {6300FCFA-97F1-4967-802E-E354D95DB0EB} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -188,4 +189,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/options.vcxproj b/MSVC_Net2013/options.vcxproj +index f627c4e..dda25b9 100644 +--- a/MSVC_Net2013/options.vcxproj ++++ b/MSVC_Net2013/options.vcxproj +@@ -23,26 +23,27 @@ + {46962B9A-C5E9-4863-9408-97514D63F420} + dispatcher + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/properties.vcxproj b/MSVC_Net2013/properties.vcxproj +index 6858140..d8a95c2 100644 +--- a/MSVC_Net2013/properties.vcxproj ++++ b/MSVC_Net2013/properties.vcxproj +@@ -23,26 +23,27 @@ + {206CC821-8BE3-4455-B09E-63F93E30F20C} + dispatcher + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/regex.vcxproj b/MSVC_Net2013/regex.vcxproj +index 84418df..c4c0cf0 100644 +--- a/MSVC_Net2013/regex.vcxproj ++++ b/MSVC_Net2013/regex.vcxproj +@@ -23,26 +23,27 @@ + {7374A5A1-4E74-44BD-918C-FDF80B97FA3F} + dispatcher + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -189,4 +190,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/resolver.vcxproj b/MSVC_Net2013/resolver.vcxproj +index 113d86a..9fa59a4 100644 +--- a/MSVC_Net2013/resolver.vcxproj ++++ b/MSVC_Net2013/resolver.vcxproj +@@ -23,26 +23,27 @@ + {E4D320F1-7D2D-43AF-874F-14524220EF92} + resolver + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -193,4 +194,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/socket-client.vcxproj b/MSVC_Net2013/socket-client.vcxproj +index 3743708..bfb8330 100644 +--- a/MSVC_Net2013/socket-client.vcxproj ++++ b/MSVC_Net2013/socket-client.vcxproj +@@ -23,26 +23,27 @@ + {1E38D900-90AC-4E18-B34C-7B08E3383087} + socket-client + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -193,4 +194,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/socket-client.vcxproj.filters b/MSVC_Net2013/socket-client.vcxproj.filters +index edb14c1..8d41b33 100644 +--- a/MSVC_Net2013/socket-client.vcxproj.filters ++++ b/MSVC_Net2013/socket-client.vcxproj.filters +@@ -15,6 +15,6 @@ + + + +- Source Files ++ + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/socket-server.vcxproj b/MSVC_Net2013/socket-server.vcxproj +index 4116263..e6744af 100644 +--- a/MSVC_Net2013/socket-server.vcxproj ++++ b/MSVC_Net2013/socket-server.vcxproj +@@ -23,26 +23,27 @@ + {7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20} + socket-server + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -193,4 +194,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/socket-server.vcxproj.filters b/MSVC_Net2013/socket-server.vcxproj.filters +index 66a88d3..8d41b33 100644 +--- a/MSVC_Net2013/socket-server.vcxproj.filters ++++ b/MSVC_Net2013/socket-server.vcxproj.filters +@@ -15,6 +15,6 @@ + + + +- Source Files ++ + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/thread.vcxproj b/MSVC_Net2013/thread.vcxproj +index 9950bbb..d1824e8 100644 +--- a/MSVC_Net2013/thread.vcxproj ++++ b/MSVC_Net2013/thread.vcxproj +@@ -22,26 +22,27 @@ + thread + {5357AB2B-A5F9-463C-92D8-00357CCC3ECE} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -184,4 +185,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/threadpool.vcxproj b/MSVC_Net2013/threadpool.vcxproj +index 9ab9748..d0a0d15 100644 +--- a/MSVC_Net2013/threadpool.vcxproj ++++ b/MSVC_Net2013/threadpool.vcxproj +@@ -22,26 +22,27 @@ + threadpool + {962484DB-2111-48A4-BEF0-194433719D0D} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -192,4 +193,4 @@ + + + +- ++ +\ No newline at end of file diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index f5880ecf7..fd4853f55 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) diff --git a/ports/gtkmm/fix_charset.patch b/ports/gtkmm/fix_charset.patch new file mode 100644 index 000000000..027d74f99 --- /dev/null +++ b/ports/gtkmm/fix_charset.patch @@ -0,0 +1,2053 @@ +diff --git a/MSVC_Net2013/gdkmm.vcxproj b/MSVC_Net2013/gdkmm.vcxproj +index d9d08ac..8c6b528 100644 +--- a/MSVC_Net2013/gdkmm.vcxproj ++++ b/MSVC_Net2013/gdkmm.vcxproj +@@ -1,266 +1,267 @@ +-??? +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- gdkmm +- {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- true +- true +- true +- true +- $(ProjectName)$(DebugDllSuffix) +- $(ProjectName)$(DebugDllSuffix) +- $(ProjectName)$(ReleaseDllSuffix) +- $(ProjectName)$(ReleaseDllSuffix) +- +- +- +- %(AdditionalOptions) +- Disabled +- _DEBUG;$(GdkMMBuildDefs);%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- +- +- Level3 +- EditAndContinue +- +- +- Generate gdkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++??? ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ gdkmm ++ {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} ++ Win32Proj ++ 8.1 ++ ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ true ++ true ++ $(ProjectName)$(DebugDllSuffix) ++ $(ProjectName)$(DebugDllSuffix) ++ $(ProjectName)$(ReleaseDllSuffix) ++ $(ProjectName)$(ReleaseDllSuffix) ++ ++ ++ ++ %(AdditionalOptions) ++ Disabled ++ _DEBUG;$(GdkMMBuildDefs);%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ ++ Level3 ++ EditAndContinue ++ ++ ++ Generate gdkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(DebugDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- +- +- +- +- %(AdditionalOptions) +- $(GdkMMBuildDefs);%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- Generate gdkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ $(OutDir)$(ProjectName)$(DebugDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ ++ ++ ++ ++ %(AdditionalOptions) ++ $(GdkMMBuildDefs);%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate gdkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- true +- true +- false +- +- +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- Disabled +- _DEBUG;$(GdkMMBuildDefs);%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- Generate gdkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ true ++ true ++ false ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ Disabled ++ _DEBUG;$(GdkMMBuildDefs);%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate gdkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(DebugDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- MachineX64 +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- $(GdkMMBuildDefs);%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- Generate gdkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ $(OutDir)$(ProjectName)$(DebugDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ $(GdkMMBuildDefs);%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate gdkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + %(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- false +- true +- true +- +- +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- {07324745-c9be-4d65-b08a-9c88188c0c28} +- false +- +- +- +- +- +- +\ No newline at end of file ++ $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ false ++ true ++ true ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {07324745-c9be-4d65-b08a-9c88188c0c28} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj +index 33dfe5e..01b9271 100644 +--- a/MSVC_Net2013/gendef.vcxproj ++++ b/MSVC_Net2013/gendef.vcxproj +@@ -21,26 +21,27 @@ + + {07324745-C9BE-4D65-B08A-9C88188C0C28} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +diff --git a/MSVC_Net2013/gtkmm.vcxproj b/MSVC_Net2013/gtkmm.vcxproj +index 2c732f8..ad9d312 100644 +--- a/MSVC_Net2013/gtkmm.vcxproj ++++ b/MSVC_Net2013/gtkmm.vcxproj +@@ -1,700 +1,701 @@ +-??? +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- gtkmm +- {907B8D15-7E12-4136-A7E6-B6ED5E055D39} +- gtkmm +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- DynamicLibrary +- MultiByte +- v120 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- true +- true +- true +- true +- $(ProjectName)$(DebugDllSuffix) +- $(ProjectName)$(DebugDllSuffix) +- $(ProjectName)$(ReleaseDllSuffix) +- $(ProjectName)$(ReleaseDllSuffix) +- +- +- +- %(AdditionalOptions) +- Disabled +- .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) ++??? ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ gtkmm ++ {907B8D15-7E12-4136-A7E6-B6ED5E055D39} ++ gtkmm ++ Win32Proj ++ 8.1 ++ ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ DynamicLibrary ++ Unicode ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ true ++ true ++ $(ProjectName)$(DebugDllSuffix) ++ $(ProjectName)$(DebugDllSuffix) ++ $(ProjectName)$(ReleaseDllSuffix) ++ $(ProjectName)$(ReleaseDllSuffix) ++ ++ ++ ++ %(AdditionalOptions) ++ Disabled ++ .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) + _DEBUG;_NO_CRT_STDIO_INLINE;$(GtkMMBuildDefs);_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- +- +- Level3 +- EditAndContinue +- +- +- Generate gtkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ ++ Level3 ++ EditAndContinue ++ ++ ++ Generate gtkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + legacy_stdio_definitions.lib;%(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(DebugDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- +- +- +- +- %(AdditionalOptions) +- .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) ++ $(OutDir)$(ProjectName)$(DebugDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ ++ ++ ++ ++ %(AdditionalOptions) ++ .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) + $(GtkMMBuildDefs);_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- Generate gtkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate gtkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + legacy_stdio_definitions.lib;%(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- false +- true +- true +- +- +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- Disabled +- .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) ++ $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ false ++ true ++ true ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ Disabled ++ .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) + _DEBUG;_NO_CRT_STDIO_INLINE;$(GtkMMBuildDefs);) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- Generate gtkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate gtkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + legacy_stdio_definitions.lib;%(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(DebugDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- true +- false +- +- +- MachineX64 +- +- +- +- +- X64 +- +- +- %(AdditionalOptions) +- .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) ++ $(OutDir)$(ProjectName)$(DebugDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalOptions) ++ .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) + $(GtkMMBuildDefs);_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- Generate gtkmm def file +- $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj +- +- ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ Generate gtkmm def file ++ $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj ++ ++ + legacy_stdio_definitions.lib;%(AdditionalDependencies) +- $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll +- $(IntDir)\$(ProjectName).def +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- {976c8f9c-1a1d-4e23-b79e-ec9091bbea0e} +- false +- +- +- {07324745-c9be-4d65-b08a-9c88188c0c28} +- false +- +- +- +- +- +- +\ No newline at end of file ++ $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll ++ $(IntDir)\$(ProjectName).def ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {976c8f9c-1a1d-4e23-b79e-ec9091bbea0e} ++ false ++ ++ ++ {07324745-c9be-4d65-b08a-9c88188c0c28} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/gtkmm3-demo.vcxproj b/MSVC_Net2013/gtkmm3-demo.vcxproj +index 9c33d45..84a988a 100644 +--- a/MSVC_Net2013/gtkmm3-demo.vcxproj ++++ b/MSVC_Net2013/gtkmm3-demo.vcxproj +@@ -23,26 +23,27 @@ + {5A8BBE25-E8D8-487B-AD2D-690438F09FA1} + gtkmm3-demo + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +@@ -251,4 +252,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj +index 1df2f4b..a484bd6 100644 +--- a/MSVC_Net2013/install.vcxproj ++++ b/MSVC_Net2013/install.vcxproj +@@ -22,28 +22,29 @@ + {2093D218-190E-4194-9421-3BA7CBF33B10} + install + Win32Proj ++ 8.1 + + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 61e7b67f5..c82bc597d 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -1,15 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - # Glibmm uses winapi functions not available in WindowsStore, so gtkmm # also if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) @@ -33,7 +21,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) diff --git a/ports/pangomm/fix_charset.patch b/ports/pangomm/fix_charset.patch new file mode 100644 index 000000000..d57063c86 --- /dev/null +++ b/ports/pangomm/fix_charset.patch @@ -0,0 +1,110 @@ +diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj +index ceca956..c29a2a1 100644 +--- a/MSVC_Net2013/gendef.vcxproj ++++ b/MSVC_Net2013/gendef.vcxproj +@@ -21,26 +21,27 @@ + + {07324745-C9BE-4D65-B08A-9C88188C0C28} + Win32Proj ++ 8.1 + + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + + Application +- MultiByte ++ Unicode + v120 + + +diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj +index fecde32..8f97675 100644 +--- a/MSVC_Net2013/install.vcxproj ++++ b/MSVC_Net2013/install.vcxproj +@@ -22,28 +22,29 @@ + {2093D218-190E-4194-9421-3BA7CBF33B10} + install + Win32Proj ++ 8.1 + + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + + Utility +- MultiByte ++ Unicode + true + v120 + + + Utility +- MultiByte ++ Unicode + v120 + + +diff --git a/MSVC_Net2013/pangomm.vcxproj b/MSVC_Net2013/pangomm.vcxproj +index aa03fad..d63becf 100644 +--- a/MSVC_Net2013/pangomm.vcxproj ++++ b/MSVC_Net2013/pangomm.vcxproj +@@ -23,26 +23,27 @@ + {A93D607A-5C37-4AEC-BA08-6A655F6DC834} + pangomm + Win32Proj ++ 8.1 + + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + + DynamicLibrary +- MultiByte ++ Unicode + v120 + + diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 58d02f268..ad350f638 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) -- cgit v1.2.3