Changeset 87cfede in opengl-game

Timestamp:

Jan 14, 2024, 2:03:00 AM (7 months ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Parents:

6d698e5

Message:

Update makefile to work in Linux, and update the build docs

Files:

• docs/README.txt (modified) (3 diffs)
• docs/game-TODO.txt (moved) (moved from TODO-game.txt )
• makefile (modified) (2 diffs)

docs/README.txt

@@ -45 +45 @@
 --------
 
-Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
+Add the Vulkan SDK repo to apt
 
-sudo apt-get install libxcb1-dev xorg-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev
-
-source setup-env.sh into your current shell
-
-mActually, I think now this should work, after following the online instructions for installing Vulkan:
-sudo apt-get install vulkan-sdk libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libglm-dev
-(Follow the instructions at https://vulkan.lunarg.com/sdk/home#linux to add the latest Vulkan SDK version to apt-get)
-(Verify that installing libvulkan-1 is not required)
+sudo apt install build-essential vulkan-sdk libglm-dev libsdl2-dev
 
 make vulkangame && ./vulkangame
@@ -60 +53 @@
 For the sfml version: (these directions need verification)
 
-sudo apt-get install libglm-dev libsfml-dev
+sudo apt install libglm-dev libsfml-dev
 
-Currently, the apt-get sfml package doesn't have Vulkan support, so need to install from source as follows:
+Currently, the apt sfml package doesn't have Vulkan support, so need to install from source as follows:
 
 Build the library yourself by following the instructions at https://www.sfml-dev.org/tutorials/2.5/compile-with-cmake.php
 
-sudo apt-get install libfreetype-dev libx11-dev libxrandr-dev libudev-dev libopengl-dev libflac-dev libogg-dev libvorbis-dev libopenal-dev libpthread-stubs0-dev
+sudo apt install libfreetype-dev libx11-dev libxrandr-dev libudev-dev libopengl-dev libflac-dev libogg-dev libvorbis-dev libopenal-dev libpthread-stubs0-dev
 
-sudo apt-get install cmake-qt-gui
+sudo apt install cmake-qt-gui
 
 Clone the sfml repo
@@ -96 +89 @@
 ---------------------------------------
 
-sudo apt-get install xorg-dev  libglew-dev libglm-dev libglfw3-dev
+sudo apt install xorg-dev  libglew-dev libglm-dev libglfw3-dev
 
 make openglref && ./openglref
 
 (Old Linux instructions for compiling game.cpp)
--sudo apt-get install cmake xorg-dev  libglew-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
+-sudo apt install cmake xorg-dev  libglew-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
 
 -Compile GLFW3 from source

makefile

@@ -35 +35 @@
 endif
 ifeq ($(OS),Linux)
-        #LIBS = `pkg-config --static --libs sdl2`
-        LIBS = 
-        LIBS := -lvulkan $(LIBS) -lSDL2 -lSDL2_image -lSDL2_ttf # TODO: figure out how to statically link these, ideally using pkg-config
+        LIBS = `pkg-config --static --libs vulkan sdl2`
 endif
 
@@ -74 +72 @@
 .PHONY: shaders
 shaders:
-        ./compile.sh
+        bash compile.sh
 
 clean: