diff options
| author | ratalaika <ratalaika@gmail.com> | 2014-11-22 00:13:09 +0100 |
|---|---|---|
| committer | ratalaika <ratalaika@gmail.com> | 2014-11-22 00:13:09 +0100 |
| commit | ab05ace3ce8b999ab665194e63b8b5d03a7787ac (patch) | |
| tree | b7657d2b85f38f53d03368fe88ef54420e83bad2 /examples | |
| parent | 05ccc4fd42a9ff2dfd33f13be29734bb7531d65a (diff) | |
| download | raylib-ab05ace3ce8b999ab665194e63b8b5d03a7787ac.tar.gz raylib-ab05ace3ce8b999ab665194e63b8b5d03a7787ac.zip | |
Added first version of OS X compilation support
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/makefile | 23 | ||||
| -rw-r--r-- | examples/textures_logo_raylib.c | 2 |
2 files changed, 22 insertions, 3 deletions
diff --git a/examples/makefile b/examples/makefile index 076c9594..f4453213 100644 --- a/examples/makefile +++ b/examples/makefile @@ -24,8 +24,8 @@ #************************************************************************************************** # define raylib platform (by default, compile for RPI) -# Other possible platforms: PLATFORM_DESKTOP PLATFORM_DESKTOP_LINUX -PLATFORM ?= PLATFORM_RPI +# Other possible platforms: PLATFORM_DESKTOP PLATFORM_DESKTOP_LINUX PLATFORM_DESKTOP_OSX +PLATFORM ?= PLATFORM_DESKTOP_OSX # define compiler: gcc for C program, define as g++ for C++ CC = gcc @@ -55,6 +55,14 @@ else LFLAGS = -L. -L../src -L/opt/vc/lib endif +# define library paths containing required libs +ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX) + LFLAGS = -L. -L../src -L../external/glfw3/lib/ -I../external/openal_soft/lib/ +else + LFLAGS = -L. -L../src +endif + + # define any libraries to link into executable # if you want to link libraries (libname.so or libname.a), use the -lname ifeq ($(PLATFORM),PLATFORM_RPI) @@ -68,11 +76,18 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev LIBS = -lraylib -lglfw -lGLEW -lGL -lopenal else +ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX) + # 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 +else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32 endif endif +endif # define additional parameters and flags for windows ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -254,9 +269,13 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) find . -type f -executable -delete rm -f *.o else +ifeq ($(PLATFORM),PLATFORM_DESKTOP_OSX) + rm -f *.o +else del *.o *.exe endif endif +endif @echo Cleaning done # instead of defining every module one by one, we can define a pattern diff --git a/examples/textures_logo_raylib.c b/examples/textures_logo_raylib.c index f4aeb738..b56f5f03 100644 --- a/examples/textures_logo_raylib.c +++ b/examples/textures_logo_raylib.c @@ -21,7 +21,7 @@ int main() InitWindow(screenWidth, screenHeight, "raylib [textures] example - texture loading and drawing"); // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) - Texture2D texture = LoadTexture("resources/raylib_logo.png"); // Texture loading + Texture2D texture = LoadTexture("./resources/raylib_logo.png"); // Texture loading //--------------------------------------------------------------------------------------- // Main game loop |