rpuzonas/raylib-cpp-template
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source 
# Conflicts:
#	Makefile
This commit is contained in:
Jonathan Moallem 2020-11-24 15:16:27 +11:00
commit 9a9f6d4d10
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -19,12 +19,14 @@ else
platform = Linux platform = Linux
compiler = g++ compiler = g++
options = -l GL -l m -l pthread -l dl -l rt -l X11 options = -l GL -l m -l pthread -l dl -l rt -l X11
libGenDirectory = # Empty
endif endif
ifeq ($(UNAMEOS), Darwin) ifeq ($(UNAMEOS), Darwin)
# Set macOS compile macros # Set macOS compile macros
platform = macOS platform = macOS
compiler = clang++ compiler = clang++
options = -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL options = -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL
libGenDirectory = src
endif endif
# Set UNIX commands # Set UNIX commands
@ -41,19 +43,20 @@ test: compile execute check clean
pull: pull:
# Pull and update the the build submodules # Pull and update the the build submodules
git submodule init; git submodule update git submodule init; git submodule update
cd vendor/raylib-cpp; git submodule init ; git submodule update cd vendor/raylib-cpp; git submodule init; git submodule update
include: pull include: pull
# Copy the relevant header files into includes # Copy the relevant header files into includes
mkdir $(mkdirOptions) include mkdir $(mkdirOptions) include
cp vendor/raylib-cpp/vendor/raylib/src/{raylib.h,raymath.h} include cp vendor/raylib-cpp/vendor/raylib/src/raylib.h include/raylib.h
cp vendor/raylib-cpp/vendor/raylib/src/raymath.h include/raymath.h
cp vendor/raylib-cpp/include/*.hpp include cp vendor/raylib-cpp/include/*.hpp include
lib: pull lib: pull
# Build the raylib static library file and copy it into lib # Build the raylib static library file and copy it into lib
cd vendor/raylib-cpp/vendor/raylib/src; make PLATFORM=PLATFORM_DESKTOP cd vendor/raylib-cpp/vendor/raylib/src; make PLATFORM=PLATFORM_DESKTOP
mkdir $(mkdirOptions) lib/$(platform) mkdir $(mkdirOptions) lib/$(platform)
cp vendor/raylib-cpp/vendor/raylib/src/libraylib.a lib/macOS/libraylib.a cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a
compile: compile:
# Create the build folder and compile the executable # Create the build folder and compile the executable