Try to fix MSB4019.

mr-phazer · Jul 6, 2023 · b2f0bd0 · b2f0bd0
1 parent 4753362
commit b2f0bd0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -12,3 +12,19 @@ jobs:
               with:
                 dotnet-version: '3.1.x'
             - run: dotnet build
+     test:
+    # Run a job for each of the specified target architectures:
+    strategy:
+      matrix:
+        arch:          
+          - amd64_x86          
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch }}
+      - name: Build something requiring CL.EXE
+        run: |
+          cmake -G "NMake Makefiles" .
+          nmake
+      # ...
diff --git a/AssetEditor.sln b/AssetEditor.sln
@@ -48,10 +48,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ContentProject", "ContentPr
 		{7FD31ACD-8D46-43FE-9E17-27198AED902B} = {7FD31ACD-8D46-43FE-9E17-27198AED902B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBXWrapperNativeDll", "FBXWRapperNativeDll\FBXWRapperNativeDll.vcxproj", "{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TESTER_CONSOLE_APP", "TESTER_CONSOLE_APP\TESTER_CONSOLE_APP.vcxproj", "{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBXWrapperNativeDll", "FBXWRapperNativeDll\FBXWRapperNativeDll.vcxproj", "{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -230,18 +230,6 @@ Global
 		{D29AB45B-3CFD-4994-BD54-CE301704D6CA}.Release|x64.Build.0 = Release|Any CPU
 		{D29AB45B-3CFD-4994-BD54-CE301704D6CA}.Release|x86.ActiveCfg = Release|Any CPU
 		{D29AB45B-3CFD-4994-BD54-CE301704D6CA}.Release|x86.Build.0 = Release|Any CPU
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|Any CPU.Build.0 = Debug|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x64.ActiveCfg = Debug|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x64.Build.0 = Debug|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x86.ActiveCfg = Debug|Win32
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x86.Build.0 = Debug|Win32
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|Any CPU.ActiveCfg = Release|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|Any CPU.Build.0 = Release|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x64.ActiveCfg = Release|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x64.Build.0 = Release|x64
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x86.ActiveCfg = Release|Win32
-		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x86.Build.0 = Release|Win32
 		{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}.Debug|Any CPU.Build.0 = Debug|x64
 		{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}.Debug|x64.ActiveCfg = Debug|x64
@@ -254,6 +242,18 @@ Global
 		{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}.Release|x64.Build.0 = Release|x64
 		{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}.Release|x86.ActiveCfg = Release|Win32
 		{2BD6E4F4-9F47-40CA-89CE-CAEBCDD4AB5F}.Release|x86.Build.0 = Release|Win32
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|Any CPU.Build.0 = Debug|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x64.ActiveCfg = Debug|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x64.Build.0 = Debug|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x86.ActiveCfg = Debug|Win32
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Debug|x86.Build.0 = Debug|Win32
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|Any CPU.ActiveCfg = Release|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|Any CPU.Build.0 = Release|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x64.ActiveCfg = Release|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x64.Build.0 = Release|x64
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x86.ActiveCfg = Release|Win32
+		{15AAE76D-0B83-45A2-B8AB-FD7BF38BDDC3}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE