Changeset ab65f84 in opengl-game

Timestamp:

Jul 2, 2019, 5:16:02 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

b6127d2

Parents:

826df16

Message:

Get the vulkangame makefile target working in both Linux and OSX

Files:

• README.txt (modified) (1 diff)
• makefile (modified) (2 diffs)

README.txt

@@ -46 +46 @@
 
 
-Vulkan Instructions
+--------------------
+VULKAN INSTRUCTIOS
 --------------------
 
+Windows
+--------
+
+???
+
 Linux:
+--------
 
-Download the Vulkan SDK from ...
+sudo apt-get install libxcb1-dev xorg-dev libsdl2-dev libglm-dev
 
--Compile GLFW3 from source
- (cmake . && make && sudo make install)
+Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
 
--sudo apt-get install libxcb1-dev xorg-dev libsdl2-dev libglm-dev
+make vulkcangame && ./vulkangame
 
 OSX
+--------
 
-Download the vulkan sdk
+brew install sdl2 (might need 'brew install sdl2 --HEAD')
 
-Theoretically, installing sdl using "brew install sdl2 --HEAD" should give me the one with VUlkan support
+Download the vulkan sdk (make sure VULKAN_SDK_PATH in the makefile points to it)
+
+make vulkcangame && ./vulkangame

makefile

@@ -2 +2 @@
 OS = $(shell uname)
 CC = g++
-CFLAGS = -std=c++11 -Wall -pedantic -rdynamic
+CFLAGS = -std=c++17 -Wall -pedantic -rdynamic
 # -rdynamic is to generate debug info for dynamic symbols on debian-based 
 # systems (tested on Linux Mint)
@@ -34 +34 @@
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 
-# from the mac makefile
-#CXX_INCLUDES = -I/Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS/include -I/usr/local/Cellar/sdl2/2.0.9_1/include/SDL2
-#LIBFLAGS =  -Wl,-rpath,$(VULKAN_SDK_PATH)/macOS/lib $(VULKAN_SDK_PATH)/macOS/lib/libvulkan.dylib -L/usr/local/Cellar/sdl2/2.0.9_1/lib -lSDL2
+CXX_FLAGS = -std=c++17 -Wall -pedantic # -O3 -rdynamic
 
-CXX_FLAGS = -std=c++17 -Wall -pedantic # -O3
+ifeq ($(OS),Darwin)
+        VULKAN_SDK_PATH = /Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS
+endif
+ifeq ($(OS),Linux)
+        VULKAN_SDK_PATH = /home/dportnoy/Desktop/VulkanSDK/1.1.106.0/x86_64
+endif
 
-VULKAN_SDK_PATH = /home/dportnoy/Desktop/VulkanSDK/1.1.106.0/x86_64
+LIB_PATHS =  -I$(VULKAN_SDK_PATH)/include
+ifeq ($(OS),Darwin)
+        LIB_PATHS := -Wl,-rpath,$(VULKAN_SDK_PATH)/lib $(LIB_PATHS)
+endif
+ifeq ($(OS),Linux)
+        LIB_PATHS := -L$(VULKAN_SDK_PATH)/lib $(LIB_PATHS)
+endif
 
-LIB_PATHS = -L$(VULKAN_SDK_PATH)/lib -I$(VULKAN_SDK_PATH)/include
-LIBS = -lvulkan -lSDL2
+LIBS = -lSDL2
+ifeq ($(OS),Darwin)
+        LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
+endif
+ifeq ($(OS),Linux)
+        LIBS := -lvulkan $(LIBS)
+endif
 
 LIB_FLAGS = $(LIB_PATHS) $(LIBS)