|
@@ -2,7 +2,7 @@
|
|
|
#
|
|
|
# raylib makefile for Desktop platforms, Raspberry Pi, Android and HTML5
|
|
|
#
|
|
|
-# Copyright (c) 2013-2019 Ramon Santamaria (@raysan5)
|
|
|
+# Copyright (c) 2013-2020 Ramon Santamaria (@raysan5)
|
|
|
#
|
|
|
# This software is provided "as-is", without any express or implied warranty. In no event
|
|
|
# will the authors be held liable for any damages arising from the use of this software.
|
|
@@ -25,8 +25,8 @@
|
|
|
|
|
|
# Define required raylib variables
|
|
|
PROJECT_NAME ?= koala_seasons
|
|
|
-RAYLIB_VERSION ?= 2.5.0
|
|
|
-RAYLIB_API_VERSION ?= 2
|
|
|
+RAYLIB_VERSION ?= 3.0.0
|
|
|
+RAYLIB_API_VERSION ?= 3
|
|
|
RAYLIB_PATH ?= C:\GitHub\raylib
|
|
|
|
|
|
# Define default options
|
|
@@ -115,13 +115,12 @@ endif
|
|
|
|
|
|
ifeq ($(PLATFORM),PLATFORM_WEB)
|
|
|
# Emscripten required variables
|
|
|
- EMSDK_PATH ?= C:/emsdk
|
|
|
- EMSCRIPTEN_VERSION ?= 1.38.32
|
|
|
- CLANG_VERSION = e$(EMSCRIPTEN_VERSION)_64bit
|
|
|
- PYTHON_VERSION = 2.7.13.1_64bit\python-2.7.13.amd64
|
|
|
- NODE_VERSION = 8.9.1_64bit
|
|
|
- export PATH = $(EMSDK_PATH);$(EMSDK_PATH)\clang\$(CLANG_VERSION);$(EMSDK_PATH)\node\$(NODE_VERSION)\bin;$(EMSDK_PATH)\python\$(PYTHON_VERSION);$(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION);C:\raylib\MinGW\bin:$$(PATH)
|
|
|
- EMSCRIPTEN = $(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION)
|
|
|
+ EMSDK_PATH ?= C:/emsdk
|
|
|
+ EMSCRIPTEN_PATH ?= $(EMSDK_PATH)/fastcomp/emscripten
|
|
|
+ CLANG_PATH = $(EMSDK_PATH)/fastcomp/bin
|
|
|
+ PYTHON_PATH = $(EMSDK_PATH)/python/2.7.13.1_64bit/python-2.7.13.amd64
|
|
|
+ NODE_PATH = $(EMSDK_PATH)/node/12.9.1_64bit/bin
|
|
|
+ export PATH = $(EMSDK_PATH);$(EMSCRIPTEN_PATH);$(CLANG_PATH);$(NODE_PATH);$(PYTHON_PATH);C:\raylib\MinGW\bin:$$(PATH)
|
|
|
endif
|
|
|
|
|
|
# Define raylib release directory for compiled library.
|
|
@@ -165,7 +164,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
|
|
|
endif
|
|
|
ifeq ($(PLATFORM),PLATFORM_WEB)
|
|
|
# HTML5 emscripten compiler
|
|
|
- # WARNING: To compile to HTML5, code must be redesigned
|
|
|
+ # WARNING: To compile to HTML5, code must be redesigned
|
|
|
# to use emscripten.h and emscripten_set_main_loop()
|
|
|
CC = emcc
|
|
|
endif
|
|
@@ -188,20 +187,24 @@ endif
|
|
|
# -std=gnu99 defines C language mode (GNU C from 1999 revision)
|
|
|
# -Wno-missing-braces ignore invalid warning (GCC bug 53119)
|
|
|
# -D_DEFAULT_SOURCE use with -std=c99 on Linux and PLATFORM_WEB, required for timespec
|
|
|
-CFLAGS += -O1 -s -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces
|
|
|
+CFLAGS += -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces
|
|
|
|
|
|
ifeq ($(BUILD_MODE),DEBUG)
|
|
|
CFLAGS += -g
|
|
|
+ ifeq ($(PLATFORM),PLATFORM_WEB)
|
|
|
+ CFLAGS += -s ASSERTIONS=1 --profiling
|
|
|
+ endif
|
|
|
+else
|
|
|
+ ifeq ($(PLATFORM),PLATFORM_WEB)
|
|
|
+ CFLAGS += -Os
|
|
|
+ else
|
|
|
+ CFLAGS += -s -O1
|
|
|
+ endif
|
|
|
endif
|
|
|
|
|
|
# Additional flags for compiler (if desired)
|
|
|
#CFLAGS += -Wextra -Wmissing-prototypes -Wstrict-prototypes
|
|
|
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
|
|
- ifeq ($(PLATFORM_OS),WINDOWS)
|
|
|
- # resource file contains windows executable icon and properties
|
|
|
- # -Wl,--subsystem,windows hides the console window
|
|
|
- CFLAGS += $(RAYLIB_PATH)/src/raylib.rc.data -Wl,--subsystem,windows
|
|
|
- endif
|
|
|
ifeq ($(PLATFORM_OS),LINUX)
|
|
|
ifeq ($(RAYLIB_LIBTYPE),STATIC)
|
|
|
CFLAGS += -D_DEFAULT_SOURCE
|
|
@@ -230,10 +233,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
|
|
|
# --profiling # include information for code profiling
|
|
|
# --memory-init-file 0 # to avoid an external memory initialization code file (.mem)
|
|
|
# --preload-file resources # specify a resources folder for data compilation
|
|
|
- CFLAGS += -Os -s USE_GLFW=3 -s TOTAL_MEMORY=67108864 --preload-file resources
|
|
|
- ifeq ($(BUILD_MODE), DEBUG)
|
|
|
- CFLAGS += -s ASSERTIONS=1 --profiling
|
|
|
- endif
|
|
|
+ CFLAGS += -s USE_GLFW=3 -s TOTAL_MEMORY=67108864 --preload-file resources
|
|
|
|
|
|
# Define a custom shell .html and output extension
|
|
|
CFLAGS += --shell-file $(RAYLIB_PATH)/src/shell.html
|
|
@@ -267,6 +267,14 @@ endif
|
|
|
LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src
|
|
|
|
|
|
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
|
|
+ ifeq ($(PLATFORM_OS),WINDOWS)
|
|
|
+ # resource file contains windows executable icon and properties
|
|
|
+ LDFLAGS += $(RAYLIB_PATH)/src/raylib.rc.data
|
|
|
+ # -Wl,--subsystem,windows hides the console window
|
|
|
+ ifeq ($(BUILD_MODE), RELEASE)
|
|
|
+ LDFLAGS += -Wl,--subsystem,windows
|
|
|
+ endif
|
|
|
+ endif
|
|
|
ifeq ($(PLATFORM_OS),BSD)
|
|
|
# Consider -L$(RAYLIB_INSTALL_PATH)
|
|
|
LDFLAGS += -L. -Lsrc -L/usr/local/lib
|
|
@@ -290,18 +298,18 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
|
|
# NOTE: WinMM library required to set high-res timer resolution
|
|
|
LDLIBS = -lraylib -lopengl32 -lgdi32 -lwinmm
|
|
|
# Required for physac examples
|
|
|
- #LDLIBS += -static -lpthread
|
|
|
+ LDLIBS += -static -lpthread
|
|
|
endif
|
|
|
ifeq ($(PLATFORM_OS),LINUX)
|
|
|
# Libraries for Debian GNU/Linux desktop compiling
|
|
|
# NOTE: Required packages: libegl1-mesa-dev
|
|
|
LDLIBS = -lraylib -lGL -lm -lpthread -ldl -lrt
|
|
|
-
|
|
|
+
|
|
|
# On X11 requires also below libraries
|
|
|
LDLIBS += -lX11
|
|
|
# NOTE: It seems additional libraries are not required any more, latest GLFW just dlopen them
|
|
|
#LDLIBS += -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
|
|
|
-
|
|
|
+
|
|
|
# On Wayland windowing system, additional libraries requires
|
|
|
ifeq ($(USE_WAYLAND_DISPLAY),TRUE)
|
|
|
LDLIBS += -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon
|
|
@@ -314,7 +322,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
|
|
ifeq ($(PLATFORM_OS),OSX)
|
|
|
# Libraries for OSX 10.9 desktop compiling
|
|
|
# NOTE: Required packages: libopenal-dev libegl1-mesa-dev
|
|
|
- LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa
|
|
|
+ LDLIBS = -lraylib -framework OpenGL -framework Cocoa -framework IOKit -framework CoreAudio -framework CoreVideo
|
|
|
endif
|
|
|
ifeq ($(PLATFORM_OS),BSD)
|
|
|
# Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling
|
|
@@ -380,7 +388,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
|
|
del *.o *.exe /s
|
|
|
endif
|
|
|
ifeq ($(PLATFORM_OS),LINUX)
|
|
|
- find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -fv
|
|
|
+ find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable|x-pie-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -fv
|
|
|
endif
|
|
|
ifeq ($(PLATFORM_OS),OSX)
|
|
|
find . -type f -perm +ugo+x -delete
|