diff options
| author | Ray <raysan5@gmail.com> | 2016-02-21 02:30:28 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2016-02-21 02:30:28 +0100 |
| commit | 2d1b2efb92725d6cf4a8b4f0660c739382d01f39 (patch) | |
| tree | 6b42c14cd9fa22e53e67ff53ce133aaadc3de987 /templates/basic_game | |
| parent | 4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf (diff) | |
| parent | 9ec47768121766cf12fef5d1bab8c8302cdac3a6 (diff) | |
| download | raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.tar.gz raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.zip | |
Merge pull request #84 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'templates/basic_game')
| -rw-r--r-- | templates/basic_game/makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/templates/basic_game/makefile b/templates/basic_game/makefile index 9a52c4eb..05732040 100644 --- a/templates/basic_game/makefile +++ b/templates/basic_game/makefile @@ -72,7 +72,8 @@ else CFLAGS = -O2 -Wall -std=c99 endif ifeq ($(PLATFORM),PLATFORM_WEB) - CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources + CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources --shell-file ../../templates/web_shell/shell.html + #-s ASSERTIONS=1 # to check for memory allocation errors (-O1 disables it) #-s ALLOW_MEMORY_GROWTH=1 # to allow memory resizing #-s TOTAL_MEMORY=16777216 # to specify heap memory size (default = 16MB) endif @@ -104,8 +105,8 @@ else ifneq ($(PLATFORM_OS),OSX) # OpenAL Soft LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH) - # GLEW - LFLAGS += -L../../external/glew/lib/$(LIBPATH) + # GLEW: Not used, replaced by GLAD + #LFLAGS += -L../../external/glew/lib/$(LIBPATH) endif endif @@ -138,8 +139,8 @@ ifeq ($(PLATFORM),PLATFORM_RPI) LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal endif ifeq ($(PLATFORM),PLATFORM_WEB) - # just adjust the correct path to libraylib.bc - LIBS = C:/raylib/raylib/src/libraylib.bc + # NOTE: Set the correct path to libraylib.bc + LIBS = ../../src/libraylib.bc endif # define additional parameters and flags for windows |