Changeset 681dbe8 in opengl-game

Timestamp:

Nov 14, 2020, 4:16:07 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl, master

Children:

57d43d0

Parents:

aa7707d

Message:

Update compile.bat to use the existing VULKAN_SDK environment variable

Files:

• .gitignore (modified) (1 diff)
• VulkanGame.vcxproj (modified) (3 diffs)
• VulkanReference.vcxproj (modified) (1 diff)
• compile.bat (modified) (1 diff)
• docs/README.txt (modified) (1 diff)

.gitignore

@@ -17 +17 @@
 .vs/
 *.filters
-include/
-lib/
 *.dll
 Debug/
 Release/
+
+include/
+lib/

VulkanGame.vcxproj

@@ -71 +71 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>include;D:\VulkanSDK\1.2.135.0\Include;$(IncludePath)</IncludePath>
-    <LibraryPath>lib;D:\VulkanSDK\1.2.135.0\Lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>include;$(VULKAN_SDK)/Include;$(VULKAN_SDK)/Third-Party/Include;$(IncludePath)</IncludePath>
+    <LibraryPath>lib;$(VULKAN_SDK)\Lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>include;$(VULKAN_SDK)/Include;$(VULKAN_SDK)/Third-Party/Include;$(IncludePath)</IncludePath>
+    <LibraryPath>lib;$(VULKAN_SDK)/Lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -124 +128 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;GAMEGUI_INCLUDE_VULKAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -129 +135 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_ttf.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

VulkanReference.vcxproj

@@ -71 +71 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>include;$(IncludePath)</IncludePath>
+    <LibraryPath>lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>include;$(IncludePath)</IncludePath>
     <LibraryPath>lib;$(LibraryPath)</LibraryPath>

compile.bat

@@ -4 +4 @@
 cd shaders
 
-set VULKAN_SDK_PATH=D:\VulkanSDK\1.2.135.0
-
 for %%f in (*.vert *.frag) do (
    set ext=%%~xf
    set ext=!ext:~1!
 
-   %VULKAN_SDK_PATH%\Bin\glslangValidator.exe -V %%f -o %%~nf-!ext!.spv
+   %VULKAN_SDK%\Bin\glslangValidator.exe -V %%f -o %%~nf-!ext!.spv
 )
 

docs/README.txt

@@ -35 +35 @@
 Create lib/ and include/ folders in the root opengl-game directory you cloned.
 
-Download the pre=compiled 64bit binaries of GLFW and GLEW.
+Download the pre-compiled 64bit binaries of GLFW and GLEW.
 Copy the include/GL/ and include/GLFW/ folders into your include/ folder.