Changeset db1b548 in opengl-game

Timestamp:

Feb 14, 2021, 8:07:22 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

faa7bac

Parents:

6053b24

Message:

Add a makefile recipe for SDLGame

Files:

• docs/README.txt (modified) (1 diff)
• makefile (modified) (4 diffs)

docs/README.txt

@@ -89 +89 @@
 source setup-env.sh into your current shell
 
+Actually, I think now this should work, after following the online instructions for installing Vulkan:
+sudo apt-get install libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-gfx-dev libsdl2-ttf-dev
+
 make vulkangame && ./vulkangame
+
+For the sfml version: (these directions need verification)
+
+sudo apt-get install libglm-dev libsfml-dev
+
+Currently, the apt-get 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-get install cmake-qt-gui
+
+Clone the sfml repo
 
 OSX

makefile

@@ -18 +18 @@
 
 IMGUI_FILES = IMGUI/imgui.cpp IMGUI/imgui_demo.cpp IMGUI/imgui_draw.cpp IMGUI/imgui_widgets.cpp
+IMGUI_IMPL_FILES =
 
 # If I were generating .o files as well, I should use $? instead of $^
@@ -42 +43 @@
 endif
 ifeq ($(OS),Linux)
-        LIB_PATHS := -L$(VULKAN_SDK_PATH)/lib $(LIB_PATHS)
+        LIB_PATHS =
 endif
 
@@ -68 +69 @@
         $(CC) $(CXX_FLAGS) -o $@ $(SRC_FILES) $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
+SRC_FILES = main-vulkan.cpp sdl-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp IMGUI/imgui_impl_sdl.cpp IMGUI/imgui_impl_vulkan.cpp $(IMGUI_FILES)
+HEADER_FILES = sdl-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp game-gui.hpp game-gui-sdl.hpp IMGUI/imgui_impl_sdl.h IMGUI/imgui_impl_vulkan.h
+
+sdlgame: $(SRC_FILES) $(HEADER_FILES)
+        $(CC) $(CXX_FLAGS) -o $@ $(SRC_FILES) $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
+
+#LIBS = `pkg-config --static --libs sfml-graphics sfml-window sfml-system`
+# using pkg-config directly didn't add -s to the end of the sfml libs and since I only installed the static ones, g++ couldn't find them
+#LIBS = -lvulkan -lsfml-graphics -lsfml-window -lsfml-system
+
+LIB_FLAGS = $(LIBS)
+
+#SRC_FILES = Vulkan.cpp vulkan-utils-new.cpp
+#HEADER_FILES = vulkan-utils-new.hpp
+
+vulkansfmlref: $(SRC_FILES) $(HEADER_FILES)
+        $(CC) $(CXX_FLAGS) -o $@ $(SRC_FILES) $(LIB_FLAGS)
+
 .PHONY: shaders
 shaders:
@@ -75 +94 @@
         rm -f openglref
         rm -f vulkanref
+        rm -f vulkansfmlref
         rm -f openglgame
+        rm -f sdlgame
         rm -f vulkangame
         rm -f shaders/*.spv