Build fixes.

simul · Jul 28, 2024 · c4055b8 · c4055b8
1 parent b22711e
commit c4055b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build_pc_client.yml b/.github/workflows/build_pc_client.yml
@@ -33,9 +33,9 @@ jobs:
         cd ${{ github.workspace }}
         mkdir build_pc_client
         cd build_pc_client
-        cmake -S .. -B . -WNo-dev -DTELEPORT_SOLUTION_NAME=TeleportClient -DVULKAN_SDK_DIR=D:/a/Teleport/Teleport/VULKAN_SDK -DVulkan_LIBRARY=D:/a/Teleport/Teleport/VULKAN_SDK/lib/vulkan-1.lib -DVulkan_INCLUDE_DIR=D:/a/Teleport/Teleport/VULKAN_SDK/include -DVulkan_GLSLANG_VALIDATOR_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslangvalidator.exe -DVulkan_GLSLC_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslc.exe -DCMAKE_BUILD_TYPE=Release -DENABLE_ENCRYPTION=false -DPLATFORM_SUPPORT_OPENGL=false -DPLATFORM_SUPPORT_VULKAN=true -DPLATFORM_SUPPORT_D3D11=false -DPLATFORM_SUPPORT_D3D12=false -DSIMUL_BUILD_SAMPLES=false -DPLATFORM_BUILD_SAMPLES=false -DPLATFORM_BUILD_MD_LIBS=false -DTELEPORT_CLIENT_USE_D3D12=false -DTELEPORT_CLIENT_USE_VULKAN=true
+        cmake -S .. -B . -WNo-dev -DCMAKE_SYSTEM_NAME=Windows -DTELEPORT_SOLUTION_NAME=TeleportClient -DVULKAN_SDK_DIR=D:/a/Teleport/Teleport/VULKAN_SDK -DVulkan_LIBRARY=D:/a/Teleport/Teleport/VULKAN_SDK/lib/vulkan-1.lib -DVulkan_INCLUDE_DIR=D:/a/Teleport/Teleport/VULKAN_SDK/include -DVulkan_GLSLANG_VALIDATOR_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslangvalidator.exe -DVulkan_GLSLC_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslc.exe -DCMAKE_BUILD_TYPE=Release -DENABLE_ENCRYPTION=false -DPLATFORM_SUPPORT_OPENGL=false -DPLATFORM_SUPPORT_VULKAN=true -DPLATFORM_SUPPORT_D3D11=false -DPLATFORM_SUPPORT_D3D12=false -DSIMUL_BUILD_SAMPLES=false -DPLATFORM_BUILD_SAMPLES=false -DPLATFORM_BUILD_MD_LIBS=false -DTELEPORT_CLIENT_USE_D3D12=false -DTELEPORT_CLIENT_USE_VULKAN=true
         # once more, now we can get a solution name.
-        cmake -S .. -B . -WNo-dev -DTELEPORT_SOLUTION_NAME=TeleportClient -DVULKAN_SDK_DIR=D:/a/Teleport/Teleport/VULKAN_SDK -DVulkan_LIBRARY=D:/a/Teleport/Teleport/VULKAN_SDK/lib/vulkan-1.lib -DVulkan_INCLUDE_DIR=D:/a/Teleport/Teleport/VULKAN_SDK/include -DVulkan_GLSLANG_VALIDATOR_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslangvalidator.exe -DVulkan_GLSLC_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslc.exe -DCMAKE_BUILD_TYPE=Release -DENABLE_ENCRYPTION=false -DPLATFORM_SUPPORT_OPENGL=false -DPLATFORM_SUPPORT_VULKAN=true -DPLATFORM_SUPPORT_D3D11=false -DPLATFORM_SUPPORT_D3D12=false -DSIMUL_BUILD_SAMPLES=false -DPLATFORM_BUILD_SAMPLES=false -DPLATFORM_BUILD_MD_LIBS=false -DTELEPORT_CLIENT_USE_D3D12=false -DTELEPORT_CLIENT_USE_VULKAN=true
+        cmake -S .. -B . -WNo-dev -DCMAKE_SYSTEM_NAME=Windows -DTELEPORT_SOLUTION_NAME=TeleportClient -DVULKAN_SDK_DIR=D:/a/Teleport/Teleport/VULKAN_SDK -DVulkan_LIBRARY=D:/a/Teleport/Teleport/VULKAN_SDK/lib/vulkan-1.lib -DVulkan_INCLUDE_DIR=D:/a/Teleport/Teleport/VULKAN_SDK/include -DVulkan_GLSLANG_VALIDATOR_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslangvalidator.exe -DVulkan_GLSLC_EXECUTABLE=D:/a/Teleport/Teleport/VULKAN_SDK/Bin/glslc.exe -DCMAKE_BUILD_TYPE=Release -DENABLE_ENCRYPTION=false -DPLATFORM_SUPPORT_OPENGL=false -DPLATFORM_SUPPORT_VULKAN=true -DPLATFORM_SUPPORT_D3D11=false -DPLATFORM_SUPPORT_D3D12=false -DSIMUL_BUILD_SAMPLES=false -DPLATFORM_BUILD_SAMPLES=false -DPLATFORM_BUILD_MD_LIBS=false -DTELEPORT_CLIENT_USE_D3D12=false -DTELEPORT_CLIENT_USE_VULKAN=true
     - name: Show CMake Output
       run: dir ${{github.workspace}}/build_pc_client
     - name: Build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,8 @@ if(NOT DEFINED TELEPORT_SOLUTION_NAME OR "${TELEPORT_SOLUTION_NAME}" MATCHES "")
 		project(Teleport_Docs VERSION ${TELEPORT_VERSION})
 		set(VS_STARTUP_PROJECT Sphinx)
 		set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Sphinx)
+	else()
+		project(Teleport VERSION ${TELEPORT_VERSION})
 	endif()
 else() 
 	project("${TELEPORT_SOLUTION_NAME}" VERSION ${TELEPORT_VERSION})