Update GNU/Linux compilation

If you have raylib on standard directories ("/usr/local/include/raylib/raylib.h" for the header and "/usr/local/lib/libraylib.a" for raylib library) you can compile without edit the makefile.
2016-03-12 18:49:28 +01:00 · 2016-03-12 18:49:28 +01:00 · c5931c75c6
commit c5931c75c6
parent d07e4f44f1
6 changed files with 91 additions and 55 deletions
--- a/examples/makefile
+++ b/examples/makefile
@ -79,16 +79,22 @@ endif

 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDES = -I. -I../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../external/glfw3/include
-# GLEW - Not required any more, replaced by GLAD
-    #INCLUDES += -I../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../external/openal_soft/include
+    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+    	INCLUDES = -I. -I../src -I/usr/local/include/raylib/
+	else
+		INCLUDES = -I. -I../src
+		# external libraries headers
+		# GLFW3
+    		INCLUDES += -I../external/glfw3/include
+		# GLEW - Not required any more, replaced by GLAD
+    	#INCLUDES += -I../external/glew/include
+		# OpenAL Soft
+    		INCLUDES += -I../external/openal_soft/include
+    endif
 endif

 # define library paths containing required libs
--- a/templates/advance_game/makefile
+++ b/templates/advance_game/makefile
@ -83,15 +83,21 @@ endif
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../../external/glfw3/include
-# GLEW - Not required any more, replaced by GLAD
-    #INCLUDES += -I../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../../external/openal_soft/include
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+    	INCLUDES = -I/usr/local/include/raylib/
+    else
+    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
+		# external libraries headers
+		# GLFW3
+    		INCLUDES += -I../../external/glfw3/include
+		# GLEW - Not required any more, replaced by GLAD
+    		#INCLUDES += -I../external/glew/include
+		# OpenAL Soft
+    		INCLUDES += -I../../external/openal_soft/include
+    endif
 endif

 # define library paths containing required libs
--- a/templates/basic_game/makefile
+++ b/templates/basic_game/makefile
@ -83,15 +83,21 @@ endif
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../../external/glfw3/include
-# GLEW
-    INCLUDES += -I../../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../../external/openal_soft/include
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+    	INCLUDES = -I/usr/local/include/raylib/
+    else
+    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
+		# external libraries headers
+		# GLFW3
+    		INCLUDES += -I../../external/glfw3/include
+		# GLEW - Not required any more, replaced by GLAD
+    		#INCLUDES += -I../external/glew/include
+		# OpenAL Soft
+    		INCLUDES += -I../../external/openal_soft/include
+    endif
 endif

 # define library paths containing required libs
--- a/templates/basic_test/makefile
+++ b/templates/basic_test/makefile
@ -82,15 +82,21 @@ endif
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../../external/glfw3/include
-# GLEW
-    INCLUDES += -I../../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../../external/openal_soft/include
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+    	INCLUDES = -I/usr/local/include/raylib/
+    else
+    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
+		# external libraries headers
+		# GLFW3
+    		INCLUDES += -I../../external/glfw3/include
+		# GLEW - Not required any more, replaced by GLAD
+    		#INCLUDES += -I../external/glew/include
+		# OpenAL Soft
+    		INCLUDES += -I../../external/openal_soft/include
+    endif
 endif

 # define library paths containing required libs
--- a/templates/simple_game/makefile
+++ b/templates/simple_game/makefile
@ -83,15 +83,21 @@ endif
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../../external/glfw3/include
-# GLEW
-    INCLUDES += -I../../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../../external/openal_soft/include
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+    	INCLUDES = -I/usr/local/include/raylib/
+    else
+    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
+		# external libraries headers
+		# GLFW3
+    		INCLUDES += -I../../external/glfw3/include
+		# GLEW - Not required any more, replaced by GLAD
+    		#INCLUDES += -I../external/glew/include
+		# OpenAL Soft
+    		INCLUDES += -I../../external/openal_soft/include
+    endif
 endif

 # define library paths containing required libs
--- a/templates/standard_game/makefile
+++ b/templates/standard_game/makefile
@ -83,15 +83,21 @@ endif
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../../external/glfw3/include
-# GLEW
-    INCLUDES += -I../../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../../external/openal_soft/include
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+    	INCLUDES = -I/usr/local/include/raylib/
+    else
+    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
+		# external libraries headers
+		# GLFW3
+    		INCLUDES += -I../../external/glfw3/include
+		# GLEW - Not required any more, replaced by GLAD
+    		#INCLUDES += -I../external/glew/include
+		# OpenAL Soft
+    		INCLUDES += -I../../external/openal_soft/include
+    endif
 endif

 # define library paths containing required libs