- Restored .clang-format

- Removed system-specific lines in .vcxproj files - Should fixed compilation on other platforms
libsdl-org · Feb 7, 2024 · 14db5a2 · 14db5a2
1 parent 101568b
commit 14db5a2
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 238 deletions.
diff --git a/.clang-format b/.clang-format
@@ -26,7 +26,7 @@ BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: true
   AfterClass: true
-  AfterControlStatement: true
+  AfterControlStatement: Never
   AfterEnum: true
   AfterFunction: true
   AfterNamespace: true

diff --git a/VisualC/SDL_ttf.vcxproj b/VisualC/SDL_ttf.vcxproj
@@ -117,7 +117,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -145,14 +144,13 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>SDL3.lib;ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>external\lib\x64;K:\ProjectsMine\SDL_ttf\external\SDL\VisualC\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>external\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -172,7 +170,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -197,14 +194,13 @@
       <PreprocessorDefinitions>DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;TTF_USE_HARFBUZZ=1;FT_PUBLIC_FUNCTION_ATTRIBUTE=;FT_CONFIG_OPTION_USE_HARFBUZZ;FT2_BUILD_LIBRARY;HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>external\lib\x64;K:\ProjectsMine\SDL_ttf\external\SDL\VisualC\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>external\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -400,4 +396,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/VisualC/SDL_ttf.vcxproj.filters b/VisualC/SDL_ttf.vcxproj.filters
@@ -177,6 +177,9 @@
     <ClCompile Include="..\external\harfbuzz\src\hb-number.cc">
       <Filter>Sources\HarfBuzz</Filter>
     </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ms-feature-ranges.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
     <ClCompile Include="..\external\harfbuzz\src\hb-ot-cff1-table.cc">
       <Filter>Sources\HarfBuzz</Filter>
     </ClCompile>
@@ -204,6 +207,42 @@
     <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape.cc">
       <Filter>Sources\HarfBuzz</Filter>
     </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-arabic.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-default.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-hangul.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-hebrew.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-indic.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-indic-table.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-khmer.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-myanmar.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-syllabic.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-thai.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-use.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-complex-vowel-constraints.cc">
+      <Filter>Sources\HarfBuzz</Filter>
+    </ClCompile>
     <ClCompile Include="..\external\harfbuzz\src\hb-ot-shape-fallback.cc">
       <Filter>Sources\HarfBuzz</Filter>
     </ClCompile>
@@ -240,50 +279,6 @@
     <ClCompile Include="..\external\freetype\src\gzip\ftgzip.c">
       <Filter>Sources\FreeType</Filter>
     </ClCompile>
-    <ClCompile Include="..\external\harfbuzz\src\graph\gsubgpos-context.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-buffer-verify.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-cairo-utils.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-cairo.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-coretext.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-directwrite.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-draw.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-face-builder.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-gdi.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-glib.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-gobject-structs.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-graphite2.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-icu.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-map.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-color.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-meta.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-name.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-arabic.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-default.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-hangul.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-hebrew.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-indic-table.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-indic.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-khmer.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-myanmar.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-syllabic.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-thai.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-use.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-ot-shaper-vowel-constraints.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-outline.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-paint-extents.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-paint.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-style.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-cff-common.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-cff1.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-cff2.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-input.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-instancer-solver.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-plan.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset-repacker.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-subset.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-uniscribe.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-wasm-api.cc" />
-    <ClCompile Include="..\external\harfbuzz\src\hb-wasm-shape.cc" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\src\version.rc">
@@ -315,4 +310,4 @@
       <Filter>x64</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/VisualC/glfont/glfont.vcxproj b/VisualC/glfont/glfont.vcxproj
@@ -113,7 +113,6 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -144,7 +143,6 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -177,7 +175,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -211,7 +208,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include;K:\ProjectsMine\SDL_ttf\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -221,7 +217,6 @@
       <AdditionalDependencies>opengl32.lib;SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\VisualC\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Message>
@@ -249,4 +244,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/VisualC/showfont/showfont.vcxproj b/VisualC/showfont/showfont.vcxproj
@@ -113,7 +113,6 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -144,16 +143,14 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include;K:\ProjectsMine\SDL_ttf\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\VisualC\x64\Release</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
     </Link>
     <PostBuildEvent>
       <Message>
@@ -178,7 +175,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -212,7 +208,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <AdditionalIncludeDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\include;K:\ProjectsMine\SDL_ttf\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -221,8 +216,7 @@
     <Link>
       <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>K:\ProjectsMine\SDL_ttf\external\SDL\VisualC\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
     </Link>
     <PostBuildEvent>
       <Message>
@@ -250,4 +244,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>