diff options
| author | Ray <[email protected]> | 2017-10-22 20:43:57 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-22 20:43:57 +0200 |
| commit | 8380c488be90ed0c29a6446b490bfaca6574436e (patch) | |
| tree | 04e6dac350ecb354600b1019cc98fdbce03198c1 /templates | |
| parent | 18601f761935cd81b0f6298e22885c9bc6b5ee6e (diff) | |
| parent | 2ba43b595ec1129bd08b89104d5e0fa962d5b2b8 (diff) | |
| download | raylib-1.8.0.tar.gz raylib-1.8.0.zip | |
Merge pull request #371 from raysan5/develop1.8.0
Integrate Develop branch
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/advance_game/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index e221e387..c418a3d6 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -67,8 +67,8 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables EMSDK_PATH = C:/emsdk - EMSCRIPTEN_VERSION = 1.37.9 - CLANG_VERSION=e1.37.9_64bit + EMSCRIPTEN_VERSION = 1.37.21 + CLANG_VERSION=e1.37.21_64bit PYTHON_VERSION=2.7.5.3_64bit NODE_VERSION=4.1.1_64bit export PATH=$(EMSDK_PATH);$(EMSDK_PATH)\clang\$(CLANG_VERSION);$(EMSDK_PATH)\node\$(NODE_VERSION)\bin;$(EMSDK_PATH)\python\$(PYTHON_VERSION);$(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION);C:\raylib\MinGW\bin:$$(PATH) @@ -218,7 +218,7 @@ endif ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains raylib icon for windows .exe # -Wl,--subsystem,windows hides the console window - WINFLAGS = $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows + CFLAGS += $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows endif # Define output extension to generate a .html file using provided shell @@ -254,7 +254,7 @@ all: # Project target defined by PROJECT_NAME $(PROJECT_NAME): $(OBJS) - $(CC) -o $(PROJECT_NAME)$(EXT) $(OBJS) $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) $(WINFLAGS) + $(CC) -o $(PROJECT_NAME)$(EXT) $(OBJS) $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) # Compile source files # NOTE: This pattern will compile every module defined on $(OBJS) |