MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/raysan5/master' into develop

Browse Source 
Conflicts:
	src/makefile
This commit is contained in:
Joshua Reisenauer 2015-11-03 17:58:30 -08:00
commit edf64c085e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gestures.c
View File

@ -40,6 +40,7 @@
int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount); int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount);
int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency); int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency);
#elif defined(__linux) #elif defined(__linux)
#include <sys/time.h> // Declares storage size of ‘now’
#include <time.h> // Used for clock functions #include <time.h> // Used for clock functions
#endif #endif
@ -685,4 +686,4 @@ static EM_BOOL EmscriptenInputCallback(int eventType, const EmscriptenTouchEvent
return 1; return 1;
} }
#endif #endif

11
src/makefile
View File

@ -67,12 +67,23 @@ else
endif endif
# define compiler flags: # define compiler flags:
<<<<<<< HEAD
# -O1 defines optimization level # -O1 defines optimization level
# -Wall turns on most, but not all, compiler warnings # -Wall turns on most, but not all, compiler warnings
# -std=c99 defines C language mode (standard C from 1999 revision) # -std=c99 defines C language mode (standard C from 1999 revision)
# -std=gnu99 defines C language mode (GNU 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, faster)
CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline
=======
# -O2 defines optimization level
# -Wall turns on most, but not all, compiler warnings
# -std=c99 use standard C from 1999 revision
ifeq ($(PLATFORM),PLATFORM_RPI)
CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline
else
CFLAGS = -O1 -Wall -std=gnu99
endif
>>>>>>> refs/remotes/raysan5/master
#CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes