Merge pull request #29 from procedural/linux-fixes

Fix compiling on Linux
This commit is contained in:
Ray 2015-09-04 17:50:16 +02:00
commit f582ab06ad
2 changed files with 3 additions and 2 deletions

View File

@ -37,6 +37,7 @@
#if defined(_WIN32)
//#include <Windows.h>
#elif defined(__linux)
#include <sys/time.h> // Declares storage size of now
#include <time.h> // Used for clock functions
#endif
@ -659,4 +660,4 @@ static EM_BOOL EmscriptenInputCallback(int eventType, const EmscriptenTouchEvent
return 1;
}
#endif
#endif

View File

@ -73,7 +73,7 @@ endif
ifeq ($(PLATFORM),PLATFORM_RPI)
CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline
else
CFLAGS = -O1 -Wall -std=c99
CFLAGS = -O1 -Wall -std=gnu99
endif
#CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes