Changeset c6fec84 in opengl-game

Timestamp:

Sep 16, 2019, 6:42:19 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

90a424f

Parents:

f133da0

Message:

Update the makefile to correctly compile openglgame

Files:

• game-gui-sdl.cpp (modified) (1 diff)
• makefile (modified) (2 diffs)
• opengl-game.cpp (modified) (1 diff)

game-gui-sdl.cpp

@@ -142 +142 @@
 
 bool GameGui_SDL::createVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) {
-   return SDL_Vulkan_CreateSurface(window, instance, surface) ?
-      RTWO_SUCCESS : RTWO_ERROR;
+   return SDL_Vulkan_CreateSurface(window, instance, surface) ? RTWO_SUCCESS : RTWO_ERROR;
 }
 

makefile

@@ -14 +14 @@
 endif
 ifeq ($(OS),Linux)
-        DEP = -lglfw3 -lGLEW -lGL -ldl -lX11 -lXrandr -lXxf86vm -lXinerama -lXcursor  -pthread
+        DEP = -lglfw3 -lGLEW -lGL -ldl -lX11 -lXrandr -lXxf86vm -lXinerama -lXcursor -pthread
 endif
 
@@ -25 +25 @@
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 
-openglgame: main-opengl.cpp opengl-game.cpp crash-logger.cpp logger.cpp game-gui-glfw.cpp
-        $(CC) $^ $(DEP) $(CFLAGS) -o $@
+openglgame: main-opengl.cpp opengl-game.cpp crash-logger.cpp logger.cpp game-gui-glfw.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
+        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
 
 CXX_FLAGS = -std=c++17 -Wall -pedantic# -O3 -rdynamic

opengl-game.cpp

@@ -119 +119 @@
                break;
             case UI_EVENT_KEY:
-               cout << "Got a key event" << endl;
                if (e.key.keycode == GLFW_KEY_ESCAPE) {
                   quit = true;