Update "libraries" and "includes" section

I've cleaned the GNU/Linux compilation, now you can compile without useless parameters.
2026-02-07 14:49:18 -05:00 · 2016-03-12 19:08:54 +01:00
parent c5931c75c6
commit ea8363a3b0
6 changed files with 125 additions and 67 deletions
--- a/examples/makefile
+++ b/examples/makefile
@ -99,17 +99,23 @@ endif

 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../src -L/opt/vc/lib
+    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
 	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)
+        	LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
    	ifneq ($(PLATFORM_OS),OSX)
    	# OpenAL Soft
-    	LFLAGS += -L../external/openal_soft/lib/$(LIBPATH)
-	# GLEW - Not required any more, replaced by GLAD
-    	#LFLAGS += -L../external/glew/lib/$(LIBPATH)
+        	LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
+	    # GLEW: Not used, replaced by GLAD
+        	#LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+    	endif
    endif
 endif

--- a/templates/advance_game/makefile
+++ b/templates/advance_game/makefile
@ -87,7 +87,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 	# add standard directories for GNU/Linux
    ifeq ($(PLATFORM_OS),LINUX)
-    	INCLUDES = -I/usr/local/include/raylib/
+    	INCLUDES = -I. -I../src -I/usr/local/include/raylib/
    else
    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
 		# external libraries headers
@ -103,6 +103,11 @@ endif
 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
 	else
    	LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
    	# external libraries to link with
@ -115,6 +120,29 @@ else
        	#LFLAGS += -L../../external/glew/lib/$(LIBPATH)
    	endif
    endif
+endif
+
+# define library paths containing required libs
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
+	else
+    	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
+        	LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+    	endif
+    endif
+endif

 # define any libraries to link into executable
 # if you want to link libraries (libname.so or libname.a), use the -lname
--- a/templates/basic_game/makefile
+++ b/templates/basic_game/makefile
@ -87,7 +87,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 	# add standard directories for GNU/Linux
    ifeq ($(PLATFORM_OS),LINUX)
-    	INCLUDES = -I/usr/local/include/raylib/
+    	INCLUDES =  -I. -I../src -I/usr/local/include/raylib/
    else
    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
 		# external libraries headers
@ -103,6 +103,11 @@ endif
 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
 	else
    	LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
    	# external libraries to link with
@ -115,6 +120,7 @@ else
        	#LFLAGS += -L../../external/glew/lib/$(LIBPATH)
    	endif
    endif
+endif

 # define any libraries to link into executable
 # if you want to link libraries (libname.so or libname.a), use the -lname
--- a/templates/basic_test/makefile
+++ b/templates/basic_test/makefile
@ -86,7 +86,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 	# add standard directories for GNU/Linux
    ifeq ($(PLATFORM_OS),LINUX)
-    	INCLUDES = -I/usr/local/include/raylib/
+    	INCLUDES = -I. -I../src -I/usr/local/include/raylib/
    else
    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
 		# external libraries headers
@ -102,6 +102,11 @@ endif
 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
 	else
    	LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
    	# external libraries to link with
@ -110,8 +115,9 @@ else
    	ifneq ($(PLATFORM_OS),OSX)
    	# OpenAL Soft
        	LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-    # GLEW
-        LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+	    # GLEW: Not used, replaced by GLAD
+        	#LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+    	endif
    endif
 endif

--- a/templates/simple_game/makefile
+++ b/templates/simple_game/makefile
@ -87,7 +87,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 	# add standard directories for GNU/Linux
    ifeq ($(PLATFORM_OS),LINUX)
-    	INCLUDES = -I/usr/local/include/raylib/
+    	INCLUDES = -I. -I../src -I/usr/local/include/raylib/
    else
    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
 		# external libraries headers
@ -103,6 +103,11 @@ endif
 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
 	else
    	LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
    	# external libraries to link with
@ -115,6 +120,7 @@ else
        	#LFLAGS += -L../../external/glew/lib/$(LIBPATH)
    	endif
    endif
+endif

 # define any libraries to link into executable
 # if you want to link libraries (libname.so or libname.a), use the -lname
--- a/templates/standard_game/makefile
+++ b/templates/standard_game/makefile
@ -87,7 +87,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 	# add standard directories for GNU/Linux
    ifeq ($(PLATFORM_OS),LINUX)
-    	INCLUDES = -I/usr/local/include/raylib/
+    	INCLUDES = -I. -I../src -I/usr/local/include/raylib/
    else
    	INCLUDES = -I. -I../../src -IC:/raylib/raylib/src
 		# external libraries headers
@ -103,6 +103,11 @@ endif
 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
    LFLAGS = -L. -L../../src -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	# add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),LINUX)
+ 		LFLAGS = -L. -L../../src
 	else
    	LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
    	# external libraries to link with
@ -115,6 +120,7 @@ else
        	#LFLAGS += -L../../external/glew/lib/$(LIBPATH)
    	endif
    endif
+endif

 # define any libraries to link into executable
 # if you want to link libraries (libname.so or libname.a), use the -lname