Merge pull request #135 from raysan5/develop

Integrate Develop branch

1 files changed, 159 insertions, 74 deletions

diff --git a/src/Makefile b/src/Makefile
index 33b666b4..3c66e4f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,35 +1,52 @@
-#**************************************************************************************************
+#******************************************************************************
 #
-#   raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
+#  raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
+#  
+#  Many Thanks to Emanuele Petriglia for his contribution on GNU/Linux pipeline.
 #
-#   Copyright (c) 2014 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.
+#  Copyright (c) 2014-2016 Ramon Santamaria (@raysan5)
 #
-#   Permission is granted to anyone to use this software for any purpose, including commercial 
-#   applications, and to alter it and redistribute it freely, subject to the following restrictions:
+#  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.
 #
-#     1. The origin of this software must not be misrepresented; you must not claim that you 
-#     wrote the original software. If you use this software in a product, an acknowledgment 
-#     in the product documentation would be appreciated but is not required.
+#  Permission is granted to anyone to use this software for any purpose,
+#  including commercial applications, and to alter it and redistribute it
+#  freely, subject to the following restrictions:
 #
-#     2. Altered source versions must be plainly marked as such, and must not be misrepresented
-#     as being the original software.
+#    1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software in a
+#    product, an acknowledgment in the product documentation would be
+#    appreciated but is not required.
 #
-#     3. This notice may not be removed or altered from any source distribution.
+#    2. Altered source versions must be plainly marked as such, and must not
+#    be misrepresented as being the original software.
 #
-#**************************************************************************************************
+#    3. This notice may not be removed or altered from any source distribution.
+#
+#******************************************************************************
+
+# Please read the wiki to know how to compile raylib, because there are
+# different methods.
 
-.PHONY: all clean
+.PHONY: all clean install unistall
 
 # define raylib platform to compile for
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 PLATFORM ?= PLATFORM_DESKTOP
 
+# define if you want shared or static version of library.
+SHARED ?= NO
+
+# determine if the file has root access (only for installing raylib)
+# "whoami" prints the name of the user that calls him (so, if it is the root
+# user, "whoami" prints "root").
+ROOT = $(shell whoami)
+
 # determine PLATFORM_OS in case PLATFORM_DESKTOP selected
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows
+    # No uname.exe on MinGW!, but OS=Windows_NT on Windows!
+    # ifeq ($(UNAME),Msys) -> Windows
     ifeq ($(OS),Windows_NT)
         PLATFORM_OS=WINDOWS
     else
@@ -49,10 +66,10 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
     # define raylib graphics api to use (on RPI, OpenGL ES 2.0 must be used)
     GRAPHICS = GRAPHICS_API_OPENGL_ES2
 else
-    # define raylib graphics api to use (OpenGL 1.1 by default)
-    GRAPHICS ?= GRAPHICS_API_OPENGL_11
+    # define raylib graphics api to use (OpenGL 3.3 by default)
+    GRAPHICS ?= GRAPHICS_API_OPENGL_33
+    #GRAPHICS = GRAPHICS_API_OPENGL_11  # Uncomment to use OpenGL 1.1
     #GRAPHICS = GRAPHICS_API_OPENGL_21  # Uncomment to use OpenGL 2.1
-    #GRAPHICS = GRAPHICS_API_OPENGL_33  # Uncomment to use OpenGL 3.3
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
     GRAPHICS = GRAPHICS_API_OPENGL_ES2
@@ -62,10 +79,10 @@ endif
 
 # define compiler: gcc for C program, define as g++ for C++
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    # define emscripten compiler
+    # emscripten compiler
     CC = emcc
 else
-    # define default gcc compiler
+    # default gcc compiler
     CC = gcc
 endif
 
@@ -74,15 +91,21 @@ endif
 #  -Wall                turns on most, but not all, compiler warnings
 #  -std=c99             defines C language mode (standard C from 1999 revision)
 #  -std=gnu99           defines C language mode (GNU C from 1999 revision)
-#  -fgnu89-inline       declaring inline functions support (GCC optimized, faster)
+#  -fgnu89-inline       declaring inline functions support (GCC optimized)
 #  -Wno-missing-braces  ignore invalid warning (GCC bug 53119)
 CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces
 
+ifeq ($(SHARED),YES)
+    CFLAGS += -fPIC
+endif
+
 #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes
 
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDES = -I. -Iexternal -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
+    INCLUDES = -I. -Iexternal -I/opt/vc/include \
+    -I/opt/vc/include/interface/vmcs_host/linux \
+    -I/opt/vc/include/interface/vcos/pthreads
 else
 # STB libraries and others
     INCLUDES = -I. -Iexternal
@@ -92,8 +115,30 @@ else
     INCLUDES += -Iexternal/openal_soft/include
 endif
 
-# define all object files required
-OBJS = core.o rlgl.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o
+# define output directory for compiled library
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        OUTPUT_PATH = ../release/win32/mingw32
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        OUTPUT_PATH = ../release/linux
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        OUTPUT_PATH = ../release/osx
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    OUTPUT_PATH = ../release/html5
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    OUTPUT_PATH = ../release/rpi
+endif
+
+# define all object files required with a wildcard
+# The wildcard takes all files that finish with ".c", then it replaces the
+# extentions with ".o", that are the object files.
+OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
+OBJS += external/stb_vorbis.o
 
 # typing 'make' will invoke the default target entry called 'all',
 # in this case, the 'default' target entry is raylib
@@ -102,78 +147,118 @@ all: raylib
 # compile raylib library
 raylib: $(OBJS)
 ifeq ($(PLATFORM),PLATFORM_WEB)
-	emcc -O1 $(OBJS) -o libraylib.bc
+    # compile raylib for web.
+	emcc -O1 $(OBJS) -o $(OUTPUT_PATH)/libraylib.bc
+	@echo "libraylib.bc generated (web version)!"
 else
-	ar rcs libraylib.a $(OBJS)
+    ifeq ($(SHARED),YES)
+    ifeq ($(PLATFORM_OS),LINUX)
+        # compile raylib to shared library version for GNU/Linux.
+        # WARNING: you should type "make clean" before doing this target 
+		$(CC) -shared -o $(OUTPUT_PATH)/libraylib.so $(OBJS)
+		@echo "libraylib.so generated (shared library)!"
+    endif
+    else
+        # compile raylib static library for desktop platforms.
+		ar rcs $(OUTPUT_PATH)/libraylib.a $(OBJS)
+		@echo "libraylib.a generated (static library)!"
+    endif
 endif
 
+# compile all modules with their prerequisites
+
 # compile core module
-# emcc core.c -o core.bc -DPLATFORM_DESKTOP
-core.o: core.c
-	$(CC) -c core.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
+core.o : core.c raylib.h rlgl.h utils.h raymath.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDE) -D$(PLATFORM)
 
 # compile rlgl module
-rlgl.o: rlgl.c
-	$(CC) -c rlgl.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
-
+rlgl.o : rlgl.c rlgl.h raymath.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDE) -D$(GRAPHICS)
+    
 # compile shapes module
-shapes.o: shapes.c
-	$(CC) -c shapes.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
-
+shapes.o : shapes.c raylib.h rlgl.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDE)
+    
 # compile textures module
-textures.o: textures.c
-	$(CC) -c textures.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
+textures.o : textures.c rlgl.h utils.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
 
 # compile text module
-text.o: text.c
-	$(CC) -c text.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
+text.o : text.c raylib.h utils.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDE)
 
 # compile models module
-models.o: models.c
-	$(CC) -c models.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
+models.o : models.c raylib.h rlgl.h raymath.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDE) -D$(PLATFORM)
 
 # compile audio module
-audio.o: audio.c
-	$(CC) -c audio.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
+audio.o : audio.c raylib.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
+    
+# compile stb_vorbis library
+external/stb_vorbis.o: external/stb_vorbis.c external/stb_vorbis.h
+	$(CC) -c -o $@ $< -O1 $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
 
 # compile utils module
-utils.o: utils.c
-	$(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
+utils.o : utils.c utils.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
 
 # compile camera module
-camera.o: camera.c
-	$(CC) -c camera.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
-
-# compile gestures module
-gestures.o: gestures.c
-	$(CC) -c gestures.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
+camera.o : camera.c raylib.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDES)
 
-# compile stb_vorbis library
-stb_vorbis.o: external/stb_vorbis.c
-	$(CC) -c external/stb_vorbis.c -O1 $(INCLUDES) -D$(PLATFORM)
+#compile gestures module
+gestures.o : gestures.c raylib.h
+	$(CC) -c $< $(CFLAGS) $(INCLUDE)
 
-# clean everything
-clean:
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(PLATFORM_OS),WINDOWS)
-		del *.o libraylib.a
+# It installs generated and needed files to compile projects using raylib.
+# The installation works manually.
+# TODO: add other platforms.
+install :
+ifeq ($(ROOT),root)
+    ifeq ($(PLATFORM_OS),LINUX)
+        # On GNU/Linux there are some standard directories that contain
+        # libraries and header files. These directory (/usr/local/lib and
+        # /usr/local/include/) are for libraries that are installed
+        # manually (without a package manager).
+        ifeq ($(SHARED),YES)
+			cp --update libraylib.so /usr/local/lib/libraylib.so
+        else
+			cp --update raylib.h /usr/local/include/raylib.h
+			cp --update libraylib.a /usr/local/lib/libraylib.a
+        endif
+		@echo "raylib dev files installed/updated!"
     else
-		rm -f *.o libraylib.a
+		@echo "This function works only on GNU/Linux systems"
     endif
+else
+	@echo "Error: no root permissions"
 endif
-ifeq ($(PLATFORM),PLATFORM_WEB)
-    ifeq ($(PLATFORM_OS),WINDOWS)
-		del *.o libraylib.bc
+
+# it removes raylib dev files installed on the system.
+# TODO: see 'install' target.
+unistall :
+ifeq ($(ROOT),root)
+    ifeq ($(PLATFORM_OS),LINUX)
+			rm --force /usr/local/include/raylib.h
+        ifeq ($(SHARED),YES)
+			rm --force /usr/local/lib/libraylib.so
+        else
+			rm --force /usr/local/lib/libraylib.a
+        endif
+		@echo "raylib dev files removed!"
     else
-		rm -f *.o libraylib.bc
+		 @echo "This function works only on GNU/Linux systems"
     endif
+else
+	@echo "Error: no root permissions"
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-	rm -f *.o libraylib.a
-endif
-	@echo Cleaning done
 
-# instead of defining every module one by one, we can define a pattern
-# this pattern below will automatically compile every module defined on $(OBJS)
-#%.o : %.c
-#	$(CC) -c $< $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
+# clean everything
+clean:
+ifeq ($(PLATFORM_OS),WINDOWS)
+	del *.o $(OUTPUT_PATH)/libraylib.a $(OUTPUT_PATH)/libraylib.bc $(OUTPUT_PATH)/libraylib.so external/stb_vorbis.o
+else
+	rm -f *.o $(OUTPUT_PATH)/libraylib.a $(OUTPUT_PATH)/libraylib.bc $(OUTPUT_PATH)/libraylib.so external/stb_vorbis.o
+endif
+	@echo "removed all generated files!"