From 74a0814a8f57fe2c234dc47ed76273df61850f26 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 21 Jul 2018 17:19:44 +0200 Subject: [PATCH] Review formatting --- examples/Makefile | 2 +- games/Makefile | 26 +++++++++++++------------- templates/advance_game/Makefile | 12 ++++++------ templates/simple_game/Makefile | 12 ++++++------ templates/standard_game/Makefile | 12 ++++++------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 7ab6527f..a7a85661 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -32,7 +32,7 @@ RAYLIB_PATH ?= .. # Define default options # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB -PLATFORM ?= PLATFORM_DESKTOP +PLATFORM ?= PLATFORM_DESKTOP # Locations of your newly installed library and associated headers. See ../src/Makefile # On Linux, if you have installed raylib but cannot compile the examples, check that diff --git a/games/Makefile b/games/Makefile index 94899a55..ab41665b 100644 --- a/games/Makefile +++ b/games/Makefile @@ -25,20 +25,20 @@ # Define required raylib variables # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() -PLATFORM ?= PLATFORM_DESKTOP -RAYLIB_PATH ?= .. -PROJECT_NAME ?= sample_game +PLATFORM ?= PLATFORM_DESKTOP +RAYLIB_PATH ?= .. +PROJECT_NAME ?= sample_game # Default path for raylib on Raspberry Pi, if installed in different path, update it! ifeq ($(PLATFORM),PLATFORM_RPI) - RAYLIB_PATH ?= /home/pi/raylib + RAYLIB_PATH ?= /home/pi/raylib endif # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Use external GLFW library instead of rglfw module -USE_EXTERNAL_GLFW ?= FALSE +USE_EXTERNAL_GLFW ?= FALSE # Use Wayland display server protocol on Linux desktop # by default it uses X11 windowing system @@ -84,13 +84,13 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables - EMSDK_PATH = C:/emsdk - EMSCRIPTEN_VERSION = 1.37.28 - CLANG_VERSION=e1.37.28_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) - EMSCRIPTEN=$(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION) + EMSDK_PATH = C:/emsdk + EMSCRIPTEN_VERSION = 1.38.8 + CLANG_VERSION = e1.38.8_64bit + PYTHON_VERSION = 2.7.13.1_64bit\python-2.7.13.amd64 + NODE_VERSION = 8.9.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) + EMSCRIPTEN = $(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION) endif RAYLIB_RELEASE_PATH ?= $(RAYLIB_PATH)/release/libs diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index e2bf2c8e..e1e089cb 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -25,20 +25,20 @@ # Define required raylib variables # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() -PLATFORM ?= PLATFORM_DESKTOP -RAYLIB_PATH = ../.. -PROJECT_NAME ?= advance_game +PLATFORM ?= PLATFORM_DESKTOP +RAYLIB_PATH = ../.. +PROJECT_NAME ?= advance_game # Default path for raylib on Raspberry Pi, if installed in different path, update it! ifeq ($(PLATFORM),PLATFORM_RPI) - RAYLIB_PATH ?= /home/pi/raylib + RAYLIB_PATH ?= /home/pi/raylib endif # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Use external GLFW library instead of rglfw module -USE_EXTERNAL_GLFW ?= FALSE +USE_EXTERNAL_GLFW ?= FALSE # Use Wayland display server protocol on Linux desktop # by default it uses X11 windowing system diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile index cc7d7f35..e82aa752 100644 --- a/templates/simple_game/Makefile +++ b/templates/simple_game/Makefile @@ -25,20 +25,20 @@ # Define required raylib variables # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() -PLATFORM ?= PLATFORM_DESKTOP -RAYLIB_PATH ?= ../.. -PROJECT_NAME ?= simple_game +PLATFORM ?= PLATFORM_DESKTOP +RAYLIB_PATH ?= ../.. +PROJECT_NAME ?= simple_game # Default path for raylib on Raspberry Pi, if installed in different path, update it! ifeq ($(PLATFORM),PLATFORM_RPI) - RAYLIB_PATH ?= /home/pi/raylib + RAYLIB_PATH ?= /home/pi/raylib endif # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Use external GLFW library instead of rglfw module -USE_EXTERNAL_GLFW ?= FALSE +USE_EXTERNAL_GLFW ?= FALSE # Use Wayland display server protocol on Linux desktop # by default it uses X11 windowing system diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile index 008c6973..d707f7f4 100644 --- a/templates/standard_game/Makefile +++ b/templates/standard_game/Makefile @@ -25,20 +25,20 @@ # Define required raylib variables # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() -PLATFORM ?= PLATFORM_DESKTOP -RAYLIB_PATH = ../.. -PROJECT_NAME ?= standard_game +PLATFORM ?= PLATFORM_DESKTOP +RAYLIB_PATH ?= ../.. +PROJECT_NAME ?= standard_game # Default path for raylib on Raspberry Pi, if installed in different path, update it! ifeq ($(PLATFORM),PLATFORM_RPI) - RAYLIB_PATH ?= /home/pi/raylib + RAYLIB_PATH ?= /home/pi/raylib endif # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Use external GLFW library instead of rglfw module -USE_EXTERNAL_GLFW ?= FALSE +USE_EXTERNAL_GLFW ?= FALSE # Use Wayland display server protocol on Linux desktop # by default it uses X11 windowing system