diff options
| author | Ray <raysan5@gmail.com> | 2017-03-29 23:27:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 23:27:11 +0200 |
| commit | 954a24545ffd65f55893bf02c3c8d530a03f099a (patch) | |
| tree | ac7321f9ef1d4ea8221aa01089e660ff477e2326 | |
| parent | 080a79f0b03bd40a4ac6dfb8c6f90a3a7379d7ad (diff) | |
| parent | 44de97ea160b0be2591be1108c389479faab8d45 (diff) | |
| download | raylib-954a24545ffd65f55893bf02c3c8d530a03f099a.tar.gz raylib-954a24545ffd65f55893bf02c3c8d530a03f099a.zip | |
Merge pull request #251 from RDR8/4krishna
Restore inadvertant changes to Makefiles
| -rw-r--r-- | examples/Makefile | 17 | ||||
| -rw-r--r-- | src/Makefile | 9 |
2 files changed, 19 insertions, 7 deletions
diff --git a/examples/Makefile b/examples/Makefile index 22438f2f..b7b83f9b 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -87,9 +87,11 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif ifeq ($(PLATFORM),PLATFORM_WEB) - CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources - #-s ALLOW_MEMORY_GROWTH=1 # to allow memory resizing - #-s TOTAL_MEMORY=16777216 # to specify heap memory size (default = 16MB) + CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --profiling --preload-file resources + # -O2 # if used, also set --memory-init-file 0 + # --memory-init-file 0 # to avoid an external memory initialization code file (.mem) + #-s ALLOW_MEMORY_GROWTH=1 # to allow memory resizing + #-s TOTAL_MEMORY=16777216 # to specify heap memory size (default = 16MB) endif ifeq ($(PLATFORM),PLATFORM_RPI) CFLAGS = -O2 -s -Wall -std=gnu99 -fgnu89-inline @@ -122,7 +124,6 @@ ifeq ($(PLATFORM),PLATFORM_RPI) INCLUDES += -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads endif ifeq ($(PLATFORM),PLATFORM_DESKTOP) - # add standard directories for GNU/Linux ifeq ($(PLATFORM_OS),WINDOWS) # external libraries headers # GLFW3 @@ -130,6 +131,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # OpenAL Soft INCLUDES += -I../src/external/openal_soft/include endif + ifeq ($(PLATFORM_OS),LINUX) + # you may optionally create this directory and install raylib + # and related headers there. Edit ../src/Makefile appropriately. + INCLUDES += -I/usr/local/include/raylib + endif + ifeq ($(PLATFORM_OS),OSX) + # additional directories for MacOS + endif endif # define library paths containing required libs diff --git a/src/Makefile b/src/Makefile index 598a9be4..4259a66b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -172,9 +172,12 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif ifeq ($(PLATFORM),PLATFORM_WEB) - CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources - #-s ALLOW_MEMORY_GROWTH=1 # to allow memory resizing - #-s TOTAL_MEMORY=16777216 # to specify heap memory size (default = 16MB) + CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --profiling --preload-file resources + # -O2 # if used, also set --memory-init-file 0 + # --memory-init-file 0 # to avoid an external memory initialization code file (.mem) + # -s ALLOW_MEMORY_GROWTH=1 # to allow memory resizing + # -s TOTAL_MEMORY=16777216 # to specify heap memory size (default = 16MB) + # -s USE_PTHREADS=1 # multithreading support endif ifeq ($(PLATFORM),PLATFORM_RPI) CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces |