Windows x64 compilation fixes

build/msbuild/lol-core.props

@@ -8,27 +8,30 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(enable_kinc)'!='no'">
-    <ClCompile Include="$(KINC_SDK_PATH)/Sources/kinc/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Sources/kinc/*/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Sources/kinc/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Sources/kinc/**/*.c" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(enable_kinc)'!='no' And '$(Platform)'=='x64'">
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Audio2/WASAPI/Sources/kinc/backend/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/Direct3D11/Sources/kinc/backend/*/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics5/G5onG4/Sources/kinc/backend/*/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Microsoft/Sources/kinc/backend/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Libraries/DirectShow/BaseClasses/*.cpp" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*.cpp" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/*/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Audio2/WASAPI/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Audio2/WASAPI/Sources/kinc/backend/**/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/Direct3D11/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/Direct3D11/Sources/kinc/backend/**/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics5/G5onG4/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics5/G5onG4/Sources/kinc/backend/**/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Microsoft/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Microsoft/Sources/kinc/backend/**/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Sources/kinc/backend/**/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Libraries/DirectShow/BaseClasses/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/System/Windows/Libraries/DirectShow/BaseClasses/**/*.c" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(enable_kinc)'!='no' And '$(Platform)'=='NX64'">
-    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/*/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/*.cpp" />
-    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/*.c" />
-    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/*/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/Backends/Graphics4/G4onG5/Sources/kinc/backend/**/*.c" />
+    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/**/*.cpp" />
+    <ClCompile Include="$(KINC_SDK_PATH)/../Backends/Switch/Sources/kinc/backend/**/*.c" />
   </ItemGroup>
 
 </Project>

src/sys/main.cpp

@@ -12,6 +12,7 @@
 
 // One of these wrappers will be overridden by the user’s version, the
 // others will just be NOPs.
+#if LOL_USE_KINC && !KINC_NO_MAIN
 int lol_kinc_kickstart(void) __attribute__((weak));
 int lol_kinc_kickstart(int argc, char **argv) __attribute__((weak));
 int lol_kinc_kickstart(int argc, char **argv, char **envp) __attribute__((weak));
@@ -20,7 +21,6 @@ int lol_kinc_kickstart(void) { return 0; }
 int lol_kinc_kickstart(int, char **) { return 0; }
 int lol_kinc_kickstart(int, char **, char **) { return 0; }
 
-#if LOL_USE_KINC && !KINC_NO_MAIN
 extern "C" int kickstart(int argc, char **argv)
 {
     char *env[] = { nullptr };