summaryrefslogtreecommitdiffhomepage
path: root/templates/basic_test
diff options
context:
space:
mode:
authorvictorfisac <[email protected]>2016-02-26 14:32:30 +0100
committervictorfisac <[email protected]>2016-02-26 14:32:30 +0100
commitce56fcb1eda06385b88c1a906f0968d742ff8130 (patch)
tree4c82fa8ce61db1ae4af3ab1e174dd8c7d5918919 /templates/basic_test
parentf582ab06add085594f2579ee6e7d625212abd204 (diff)
parent75a73d94171051037fcf670852877977d9251520 (diff)
downloadraylib-ce56fcb1eda06385b88c1a906f0968d742ff8130.tar.gz
raylib-ce56fcb1eda06385b88c1a906f0968d742ff8130.zip
Merge remote-tracking branch 'refs/remotes/raysan5/master'
Diffstat (limited to 'templates/basic_test')
-rw-r--r--templates/basic_test/makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/templates/basic_test/makefile b/templates/basic_test/makefile
index cf763628..a0ed2608 100644
--- a/templates/basic_test/makefile
+++ b/templates/basic_test/makefile
@@ -83,7 +83,7 @@ endif
ifeq ($(PLATFORM),PLATFORM_RPI)
INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
else
- INCLUDES = -I. -I../../src
+ INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
# external libraries headers
# GLFW3
INCLUDES += -I../../external/glfw3/include
@@ -97,14 +97,14 @@ endif
ifeq ($(PLATFORM),PLATFORM_RPI)
LFLAGS = -L. -L../../src -L/opt/vc/lib
else
- LFLAGS = -L. -L../../src
+ LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
# external libraries to link with
# GLFW3
LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
ifneq ($(PLATFORM_OS),OSX)
# OpenAL Soft
LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
- # GLEW
+ # GLEW
LFLAGS += -L../../external/glew/lib/$(LIBPATH)
endif
endif
@@ -115,11 +115,13 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
ifeq ($(PLATFORM_OS),LINUX)
# libraries for Debian GNU/Linux desktop compiling
# requires the following packages:
- # libopenal-dev libglew-dev libegl1-mesa-dev
- LIBS = -lraylib -lglfw3 -lGLEW -lGL -lopenal -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lm -pthread
+ # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+ LIBS = -lraylib -lglfw3 -lGLEW -lGL -lopenal -lm -pthread
+ # on XWindow could require also below libraries, just uncomment
+ #LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
else
ifeq ($(PLATFORM_OS),OSX)
- # libraries for OS X 10.9 desktop compiling
+ # libraries for OS X 10.9 desktop compiling
# requires the following packages:
# libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
@@ -136,14 +138,15 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
endif
ifeq ($(PLATFORM),PLATFORM_WEB)
- LIBS = ../../src/libraylib.bc
+ # just adjust the correct path to libraylib.bc
+ LIBS = C:/raylib/raylib/src/libraylib.bc
endif
# define additional parameters and flags for windows
ifeq ($(PLATFORM_OS),WINDOWS)
# resources file contains windows exe icon
# -Wl,--subsystem,windows hides the console window
- WINFLAGS = ../../src/resources -Wl,--subsystem,windows
+ WINFLAGS = C:/raylib/raylib/src/resources -Wl,--subsystem,windows
endif
ifeq ($(PLATFORM),PLATFORM_WEB)