diff options
| author | Joshua Reisenauer <kd7tck@msn.com> | 2016-05-16 19:54:03 -0700 |
|---|---|---|
| committer | Joshua Reisenauer <kd7tck@msn.com> | 2016-05-16 19:54:03 -0700 |
| commit | cd7f25830bcf1f1bdc2efcde8ec70759b8eac3fc (patch) | |
| tree | 1b93a694de0babedbf23f884e75a098eca210c52 /templates | |
| parent | 706755d1464bd65623755c6c2b4df931a37e9eb5 (diff) | |
| parent | 0e29aa2951fe11e9d0fabec2182ed6309fce37bb (diff) | |
| download | raylib-cd7f25830bcf1f1bdc2efcde8ec70759b8eac3fc.tar.gz raylib-cd7f25830bcf1f1bdc2efcde8ec70759b8eac3fc.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/advance_game/Makefile | 7 | ||||
| -rw-r--r-- | templates/basic_game/Makefile | 5 | ||||
| -rw-r--r-- | templates/basic_test/Makefile | 7 | ||||
| -rw-r--r-- | templates/simple_game/Makefile | 7 | ||||
| -rw-r--r-- | templates/standard_game/Makefile | 7 |
5 files changed, 24 insertions, 9 deletions
diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index ee982de4..b3947205 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -109,7 +109,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) LFLAGS = -L. -L../../src else - LFLAGS = -L. -L../../src -LC:/raylib/raylib/src + LFLAGS = -L. -L../../src + ifeq ($(PLATFORM_OS),WINDOWS) + LFLAGS += -LC:/raylib/raylib/src + endif # external libraries to link with # GLFW3 LFLAGS += -L../../external/glfw3/lib/$(LIBPATH) @@ -134,7 +137,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # libraries for OS X 10.9 desktop compiling # requires the following packages: # libglfw3-dev libopenal-dev libegl1-mesa-dev - LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa + LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed diff --git a/templates/basic_game/Makefile b/templates/basic_game/Makefile index 3b2a06d0..76337490 100644 --- a/templates/basic_game/Makefile +++ b/templates/basic_game/Makefile @@ -109,7 +109,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) LFLAGS = -L. -L../../src else - LFLAGS = -L. -L../../src -LC:/raylib/raylib/src + LFLAGS = -L. -L../../src + ifeq ($(PLATFORM_OS),WINDOWS) + LFLAGS += -LC:/raylib/raylib/src + endif # external libraries to link with # GLFW3 LFLAGS += -L../../external/glfw3/lib/$(LIBPATH) diff --git a/templates/basic_test/Makefile b/templates/basic_test/Makefile index b08aacdf..b6fd44a7 100644 --- a/templates/basic_test/Makefile +++ b/templates/basic_test/Makefile @@ -108,7 +108,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) LFLAGS = -L. -L../../src else - LFLAGS = -L. -L../../src -LC:/raylib/raylib/src + LFLAGS = -L. -L../../src + ifeq ($(PLATFORM_OS),WINDOWS) + LFLAGS += -LC:/raylib/raylib/src + endif # external libraries to link with # GLFW3 LFLAGS += -L../../external/glfw3/lib/$(LIBPATH) @@ -133,7 +136,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # libraries for OS X 10.9 desktop compiling # requires the following packages: # libglfw3-dev libopenal-dev libegl1-mesa-dev - LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa + LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile index 6a3adcc8..3d303082 100644 --- a/templates/simple_game/Makefile +++ b/templates/simple_game/Makefile @@ -109,7 +109,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) LFLAGS = -L. -L../../src else - LFLAGS = -L. -L../../src -LC:/raylib/raylib/src + LFLAGS = -L. -L../../src + ifeq ($(PLATFORM_OS),WINDOWS) + LFLAGS += -LC:/raylib/raylib/src + endif # external libraries to link with # GLFW3 LFLAGS += -L../../external/glfw3/lib/$(LIBPATH) @@ -134,7 +137,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # libraries for OS X 10.9 desktop compiling # requires the following packages: # libglfw3-dev libopenal-dev libegl1-mesa-dev - LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa + LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile index 4629d1b1..c7cb7add 100644 --- a/templates/standard_game/Makefile +++ b/templates/standard_game/Makefile @@ -109,7 +109,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) LFLAGS = -L. -L../../src else - LFLAGS = -L. -L../../src -LC:/raylib/raylib/src + LFLAGS = -L. -L../../src + ifeq ($(PLATFORM_OS),WINDOWS) + LFLAGS += -LC:/raylib/raylib/src + endif # external libraries to link with # GLFW3 LFLAGS += -L../../external/glfw3/lib/$(LIBPATH) @@ -134,7 +137,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # libraries for OS X 10.9 desktop compiling # requires the following packages: # libglfw3-dev libopenal-dev libegl1-mesa-dev - LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa + LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed |