Changeset 754cf5a in opengl-game

Timestamp:

Jun 30, 2019, 8:10:49 PM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

a8c958b

Parents:

972aca1 (diff), 71876b9 (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.

Message:

Merge branch 'master' of medievaltech.com:opengl-game

Files:

• .gitignore (modified) (1 diff)
• CrashLogger.cpp (modified) (3 diffs)
• README.txt (modified) (2 diffs)
• makefile (modified) (3 diffs)
• new-vulkan-game.cpp (added)
• vulkan-game.cpp (added)

.gitignore

@@ +1 @@
+vulkangame
 newgame
 pong

CrashLogger.cpp

@@ -5 +5 @@
 #include <csignal>
 #include <cstring>
-#include <cstdint> // Check if this lets me remove any windows includes
 
 #include <fcntl.h>
@@ -15 +14 @@
 
 #ifdef WINDOWS
+   // Check if this is necessary or lets me remove any windows includes
+   // also check if it's needed in Linux
+   #include <cstdint>
+
    #include <windows.h>
    #include <io.h>
@@ -33 +36 @@
    #include <unistd.h>
    #include <execinfo.h>
-   #include <errno.h>
    #include <cxxabi.h>
-   #include <cstring>
+
+   // CHeck if these are needed in Linux
+   //#include <errno.h>
+   //#include <cstring>
 
    void abortHandler(int signum);

README.txt

@@ -8 +8 @@
 (Old Linux instructions for compiling game.cpp)
 -sudo apt-get install cmake xorg-dev  libglew-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
--
---Compile GLFW3 from source
-- (cmake . && make && sudo make install)
+
+-Compile GLFW3 from source
+ (cmake . && make && sudo make install)
 
 Installation Instructions for OSX
@@ -44 +44 @@
 
 Open and run NewOpenGLGame.sln in Visual Studio 2017 and run it.
+
+
+Vulkan Instructions
+--------------------
+
+Linux:
+
+Download the Vulkan SDK from ...
+
+-Compile GLFW3 from source
+ (cmake . && make && sudo make install)
+
+-sudo apt-get install libxcb1-dev xorg-dev libsdl2-dev libglm-dev

makefile

@@ +1 @@
+# CFLAGS are compiler flags and LIBFLAGS could be renamed LINKER_FLAGS
 OS = $(shell uname)
 CC = g++
-CFLAGS = -std=c++0x -Wall -pedantic -rdynamic
+CFLAGS = -std=c++11 -Wall -pedantic -rdynamic
 # -rdynamic is to generate debug info for dynamic symbols on debian-based 
 # systems (tested on Linux Mint)
@@ -33 +34 @@
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 
+VULKAN_SDK_PATH = /home/dportnoy/Desktop/VulkanSDK/1.1.106.0/x86_64
+CFLAGS_VULKAN = -std=c++17 -I$(VULKAN_SDK_PATH)/include -Wall -pedantic
+#LIBFLAGS = -L$(VULKAN_SDK_PATH)/lib `pkg-config --static --libs glfw3` -lvulkan
+LIBFLAGS = -L$(VULKAN_SDK_PATH)/lib -lvulkan -lSDL2
+
+vulkangame: new-vulkan-game.cpp
+        $(CC) $(CFLAGS_VULKAN) -o $@ $^ $(LIBFLAGS)
+
 clean:
         rm -f newgame
@@ -38 +47 @@
         rm -f mygame
         rm -f demo
+        rm -f vulkangame