Changeset 187b0f5 in opengl-game for makefile

Timestamp:

Mar 11, 2021, 2:44:43 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

301c90a

Parents:

20e4c2b

git-author:

Dmitry Portnoy <dportnoy@…> (03/11/21 02:39:25)

git-committer:

Dmitry Portnoy <dportnoy@…> (03/11/21 02:44:43)

Message:

Change VulkanGame and SDLGame to only use discrete GPUs and switch the timer class to steady_clock

File:

• makefile (modified) (4 diffs)

makefile

@@ -1 @@
-# CFLAGS are compiler flags and LIBFLAGS could be renamed LINKER_FLAGS
+# CXX_FLAGS are C++ compiler flags and LIBFLAGS could be renamed LINKER_FLAGS
 OS = $(shell uname)
 CC = g++
-CFLAGS = -std=c++17 -Wall -pedantic -rdynamic
+#CXX_FLAGS = -std=c++17 -Wall -pedantic -g3 -rdynamic
+CXX_FLAGS = -std=c++17 -Wall -pedantic -O3
 # -rdynamic is to generate debug info for dynamic symbols on debian-based 
 # systems (tested on Linux Mint)
@@ -24 +25 @@
 
 openglref: new-game.cpp logger.cpp utils.cpp crash-logger.cpp IMGUI/imgui_impl_glfw.cpp IMGUI/imgui_impl_opengl3.cpp $(IMGUI_FILES)
-        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
+        $(CC) $^ $(DEP) $(CXX_FLAGS) -o $@ -DGLEW_STATIC
 
 openglgame: main-opengl.cpp opengl-game.cpp crash-logger.cpp logger.cpp game-gui-glfw.cpp graphics-pipeline_opengl.cpp IMGUI/imgui_impl_glfw.cpp IMGUI/imgui_impl_opengl3.cpp $(IMGUI_FILES)
-        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
-
-CXX_FLAGS = -std=c++17 -Wall -pedantic# -O3 -rdynamic
+        $(CC) $^ $(DEP) $(CXX_FLAGS) -o $@ -DGLEW_STATIC
 
 ifeq ($(OS),Darwin)
@@ -46 +45 @@
 endif
 
-LIBS = `pkg-config --static --libs sdl2 sdl2_image sdl2_ttf sdl2_gfx`
+LIBS = `pkg-config --static --libs sdl2 sdl2_image sdl2_ttf`
 ifeq ($(OS),Darwin)
         LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
 endif
 ifeq ($(OS),Linux)
-        LIBS = `pkg-config --static --libs sdl2`
-        LIBS := -lvulkan $(LIBS) -lSDL2_image -lSDL2_ttf -lSDL2_gfx # TODO: figure out how to statically link these, ideally using pkg-config
+        #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
 endif
 
@@ -63 +63 @@
 GUI_HEADER_FILES = gui/screen.hpp gui/main-screen.hpp gui/game-screen.hpp gui/ui-element.hpp gui/button.hpp gui/panel.hpp gui/ui-value.hpp
 
-SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp $(GUI_SRC_FILES)
-HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp $(GUI_HEADER_FILES)
+vulkangame: SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp IMGUI/imgui_impl_sdl.cpp IMGUI/imgui_impl_vulkan.cpp $(IMGUI_FILES)
+vulkangame: HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp IMGUI/imgui_impl_sdl.h IMGUI/imgui_impl_vulkan.h
 
 vulkangame: $(SRC_FILES) $(HEADER_FILES)
         $(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 = 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)
+sdlgame: 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)