diff options
| author | raysan5 <raysan5@gmail.com> | 2015-01-04 18:05:50 +0100 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2015-01-04 18:05:50 +0100 |
| commit | 4a7e522d4bb376d2277895d1d99eb0382f8bbefb (patch) | |
| tree | 0410f5604cc3cfc036f6c1f3ac4333ac33726660 | |
| parent | b2a5390adbfb3f88ecc94e977c56bc00fac4cfbc (diff) | |
| download | raylib-4a7e522d4bb376d2277895d1d99eb0382f8bbefb.tar.gz raylib-4a7e522d4bb376d2277895d1d99eb0382f8bbefb.zip | |
Review build system for Android and RPI1.2.2
| -rw-r--r-- | examples/makefile | 10 | ||||
| -rw-r--r-- | src/core.c | 14 | ||||
| -rw-r--r-- | src/makefile | 9 | ||||
| -rw-r--r-- | src_android/jni/Android.mk | 1 |
4 files changed, 18 insertions, 16 deletions
diff --git a/examples/makefile b/examples/makefile index 4771d94d..9763b233 100644 --- a/examples/makefile +++ b/examples/makefile @@ -32,7 +32,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(OS),Windows_NT) SUBPLATFORM=WINDOWS else - UNAMEOS = $(shell uname -s) + UNAMEOS:=$(shell uname) ifeq ($(UNAMEOS),Linux) SUBPLATFORM=LINUX else @@ -290,17 +290,19 @@ audio_music_stream: audio_music_stream.c # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) + ifeq ($(SUBPLATFORM),OSX) + rm -f *.o + else ifeq ($(SUBPLATFORM),LINUX) find . -type f -executable -delete rm -f *.o - endif - ifeq ($(SUBPLATFORM),OSX) - rm -f *.o else del *.o *.exe endif + endif endif ifeq ($(PLATFORM),PLATFORM_RPI) + find . -type f -executable -delete rm -f *.o endif ifeq ($(PLATFORM),PLATFORM_WEB) @@ -170,7 +170,6 @@ static Matrix downscaleView; // Matrix to downscale view (in case #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI) || defined(PLATFORM_WEB) static const char *windowTitle; // Window text title... -static char configFlags = 0; static bool customCursor = false; // Tracks if custom cursor has been set static bool cursorOnScreen = false; // Tracks if cursor is inside client area @@ -204,6 +203,7 @@ static double updateTime, drawTime; // Time measures for update and draw static double frameTime; // Time measure for one frame static double targetTime = 0.0; // Desired time for one frame, if 0 not applied +static char configFlags = 0; static bool showLogo = false; //---------------------------------------------------------------------------------- @@ -455,12 +455,6 @@ int GetScreenHeight(void) return screenHeight; } -// Get the last key pressed -int GetKeyPressed(void) -{ - return lastKeyPressed; -} - // Sets Background Color void ClearBackground(Color color) { @@ -674,6 +668,12 @@ bool IsKeyUp(int key) else return false; } +// Get the last key pressed +int GetKeyPressed(void) +{ + return lastKeyPressed; +} + // Detect if a mouse button has been pressed once bool IsMouseButtonPressed(int button) { diff --git a/src/makefile b/src/makefile index 6f402713..8566abe4 100644 --- a/src/makefile +++ b/src/makefile @@ -31,7 +31,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(OS),Windows_NT) SUBPLATFORM=WINDOWS else - UNAMEOS = $(shell uname -s) + UNAMEOS:=$(shell uname) ifeq ($(UNAMEOS),Linux) SUBPLATFORM=LINUX else @@ -144,15 +144,16 @@ stb_vorbis.o: stb_vorbis.c # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) + ifeq ($(SUBPLATFORM),OSX) + rm -f *.o libraylib.a + else ifeq ($(SUBPLATFORM),LINUX) find . -type f -executable -delete rm -f *.o libraylib.a - endif - ifeq ($(SUBPLATFORM),OSX) - rm -f *.o libraylib.a else del *.o libraylib.a endif + endif endif ifeq ($(PLATFORM),PLATFORM_RPI) rm -f *.o libraylib.a diff --git a/src_android/jni/Android.mk b/src_android/jni/Android.mk index 56316b17..73a2cc7f 100644 --- a/src_android/jni/Android.mk +++ b/src_android/jni/Android.mk @@ -40,7 +40,6 @@ LOCAL_SRC_FILES :=\ ../../src/core.c \ ../../src/rlgl.c \ ../../src/raymath.c \ - ../../src/stb_image.c \ ../../src/textures.c \ ../../src/text.c \ ../../src/shapes.c \ |