Changeset 756162f in opengl-game for makefile

Timestamp:

May 1, 2021, 6:26:44 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

9d21aac

Parents:

b8072d3 (diff), cb6fabb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:26:23)

git-committer:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:26:44)

Message:

Merge branch 'feature/imgui-sdl' of medievaltech.com:opengl-game into feature/imgui-sdl

File:

• makefile (modified) (2 diffs)

makefile

@@ -30 +30 @@
         $(CC) $^ $(DEP) $(CXX_FLAGS) -o $@ -DGLEW_STATIC
 
-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
-
-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 =
-endif
-
 LIBS = `pkg-config --static --libs sdl2 sdl2_image sdl2_ttf`
 ifeq ($(OS),Darwin)
-        LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
+        LIBS := -lvulkan $(LIBS)
 endif
 ifeq ($(OS),Linux)
@@ -89 +74 @@
 .PHONY: shaders
 shaders:
-        cd shaders && ../compile.sh && cd ..
+        ./compile.sh
 
 clean: