[ion] Rename sdl to simulator

build/config.mak

@@ -24,11 +24,3 @@ include build/toolchain.$(TOOLCHAIN).mak
 SFLAGS += -DDEBUG=$(DEBUG)
 SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT)
 SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)
-
-# Build type (Debug or Release)
-ifeq ($(DEBUG),1)
-  BUILD_TYPE = debug
-else
-  BUILD_TYPE = release
-endif
-BUILD_DIR := $(BUILD_DIR)/$(BUILD_TYPE)

build/defaults.mak

@@ -23,7 +23,12 @@ SFLAGS += -Wall
 SFLAGS += -MD -MP
 
 # Building directory
-BUILD_DIR = output/$(PLATFORM)
+ifeq ($(DEBUG),1)
+  BUILD_TYPE = debug
+else
+  BUILD_TYPE = release
+endif
+BUILD_DIR = output/$(BUILD_TYPE)/$(PLATFORM)
 
 # Define "Q" as an arobase by default to silence-out every command run by make.
 # If V=1 is supplied on the make command line, undefine Q so that every command

build/platform.emscripten.mak

@@ -1,5 +0,0 @@
-TOOLCHAIN = emscripten
-USE_LIBA = 0
-ION_KEYBOARD_LAYOUT = layout_B2
-EXE = js
-EPSILON_GETOPT = 1

build/platform.sdl.mak

@@ -1,11 +0,0 @@
-USE_LIBA = 0
-ION_KEYBOARD_LAYOUT = layout_B2
-EPSILON_GETOPT = 1
-
-SFLAGS += -fPIE
-
-TARGET ?= $(HOST)
-
-BUILD_DIR := $(BUILD_DIR)/$(TARGET)
-
-include build/platform.sdl.$(TARGET).mak

build/platform.simulator.mak

@@ -1,9 +1,11 @@
-TOOLCHAIN ?= host-gcc
-ifeq ($(OS),Windows_NT)
-  TOOLCHAIN = mingw
-endif
 USE_LIBA = 0
 ION_KEYBOARD_LAYOUT = layout_B2
-EXE = elf
-EPSILON_ONBOARDING_APP = 0
+EPSILON_GETOPT = 1
+
 SFLAGS += -fPIE
+
+TARGET ?= $(HOST)
+
+BUILD_DIR := $(BUILD_DIR)/$(TARGET)
+
+include build/platform.simulator.$(TARGET).mak

build/platform.simulator.web.mak

@@ -0,0 +1,2 @@
+TOOLCHAIN = emscripten
+EXE = js

ion/src/sdl/windows/Makefile

@@ -1,10 +0,0 @@
-ion_src += $(addprefix ion/src/sdl/windows/, \
-  images.cpp \
-  language.cpp \
-  resources.rc \
-)
-ion_src += $(addprefix ion/src/sdl/shared/, \
-  telemetry_dummy.cpp \
-)
-
-LDFLAGS += -lgdiplus

ion/src/simulator/Makefile

@@ -17,7 +17,7 @@ ion_src += $(addprefix ion/src/shared/, \
   dummy/usb.cpp \
 )
 
-ion_src += $(addprefix ion/src/sdl/shared/, \
+ion_src += $(addprefix ion/src/simulator/shared/, \
   display.cpp \
   events_keyboard_platform.cpp \
   keyboard.cpp \
@@ -25,5 +25,5 @@ ion_src += $(addprefix ion/src/sdl/shared/, \
   layout.cpp \
 )
 
-include ion/src/sdl/$(TARGET)/Makefile
-include ion/src/sdl/external/Makefile
+include ion/src/simulator/$(TARGET)/Makefile
+include ion/src/simulator/external/Makefile

ion/src/simulator/android/Makefile

@@ -1,10 +1,10 @@
-ion_src += $(addprefix ion/src/sdl/android/src/cpp/, \
+ion_src += $(addprefix ion/src/simulator/android/src/cpp/, \
   images.cpp \
   language.cpp \
   telemetry.cpp \
 )
 
-$(call object_for,ion/src/sdl/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1
+$(call object_for,ion/src/simulator/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1
 
 LDFLAGS += -ljnigraphics -llog
 
@@ -12,15 +12,15 @@ LDFLAGS += -ljnigraphics -llog
 # Some android resources needs to be filtered through ImageMagick. Others are
 # simply copied over.
 
-$(BUILD_DIR)/app/res/mipmap/ic_launcher.png: ion/src/sdl/assets/logo.svg | $$(@D)/.
+$(BUILD_DIR)/app/res/mipmap/ic_launcher.png: ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
 	$(Q) convert -background "#FFB734" $< $@
 
-$(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_foreground.png: ion/src/sdl/assets/logo.svg | $$(@D)/.
+$(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_foreground.png: ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
 	$(Q) convert -background none $< -resize 512x512 -gravity center -background none -extent 1024x1024 $@
 
-$(BUILD_DIR)/app/res/%: ion/src/sdl/android/src/res/% $$(@D)/.
+$(BUILD_DIR)/app/res/%: ion/src/simulator/android/src/res/% $$(@D)/.
 	$(call rule_label,COPY)
 	$(Q) cp $< $@
 
@@ -44,13 +44,13 @@ ifndef NDK_ABI
 NDK_ABIS = armeabi-v7a arm64-v8a x86 x86_64
 
 epsilon_apk_deps = $(patsubst %,$(BUILD_DIR)/app/libs/%/libepsilon.so,$(NDK_ABIS))
-epsilon_apk_deps += $(subst ion/src/sdl/android/src/res,$(BUILD_DIR)/app/res,$(wildcard ion/src/sdl/android/src/res/*/*))
+epsilon_apk_deps += $(subst ion/src/simulator/android/src/res,$(BUILD_DIR)/app/res,$(wildcard ion/src/simulator/android/src/res/*/*))
 epsilon_apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/ic_launcher_foreground.png)
 
 .PHONY: gradle_%
 gradle_%: $(epsilon_apk_deps)
-	@echo "GRADLE ion/src/sdl/android/build.gradle"
-	$(Q) ANDROID_HOME=/usr/local/android EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) gradle -b ion/src/sdl/android/build.gradle $*
+	@echo "GRADLE ion/src/simulator/android/build.gradle"
+	$(Q) ANDROID_HOME=/usr/local/android EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) gradle -b ion/src/simulator/android/build.gradle $*
 
 DEFAULT = epsilon.apk
 

ion/src/simulator/external/Makefile

@@ -1,6 +1,6 @@
-SFLAGS += -Iion/src/sdl/external/sdl/include
+SFLAGS += -Iion/src/simulator/external/sdl/include
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   SDL.c \
   SDL_assert.c \
   SDL_dataqueue.c \
@@ -99,7 +99,7 @@ endif
 # Ignore warnings from external sources
 SDL_SFLAGS += -w
 
-include ion/src/sdl/external/config.$(TARGET).mak
+include ion/src/simulator/external/config.$(TARGET).mak
 
 $(call object_for,$(sdl_src)): SFLAGS += $(SDL_SFLAGS)
 

ion/src/simulator/external/config.android.mak

@@ -1,6 +1,6 @@
 SDL_SFLAGS += -DGL_GLEXT_PROTOTYPES
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/android/SDL_androidaudio.c \
   audio/openslES/SDL_openslES.c \
   core/android/SDL_android.c \
@@ -28,7 +28,7 @@ sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
   video/android/SDL_androidwindow.c \
 )
 
-sdl_src += ion/src/sdl/external/sdl/src/hidapi/android/hid.c
+sdl_src += ion/src/simulator/external/sdl/src/hidapi/android/hid.c
 
 # Build the android native library cpufeatures
 SDL_SFLAGS += -I$(NDK_PATH)/sources/android/cpufeatures

ion/src/simulator/external/config.ios.mak

@@ -2,7 +2,7 @@
 
 SDL_SFLAGS += -fasm-blocks -fstrict-aliasing -fobjc-arc
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/coreaudio/SDL_coreaudio.m \
   file/cocoa/SDL_rwopsbundlesupport.m \
   filesystem/cocoa/SDL_sysfilesystem.m \

ion/src/simulator/external/config.macos.mak

@@ -1,10 +1,10 @@
 # This file is built manually by mimic-ing SDL's Xcode project
 
 SDL_SFLAGS += -fasm-blocks -fstrict-aliasing
-SDL_SFLAGS += -Iion/src/sdl/external/sdl/src/video/khronos
-SDL_SFLAGS += -Iion/src/sdl/external/sdl/src/hidapi/hidapi
+SDL_SFLAGS += -Iion/src/simulator/external/sdl/src/video/khronos
+SDL_SFLAGS += -Iion/src/simulator/external/sdl/src/hidapi/hidapi
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/coreaudio/SDL_coreaudio.m \
   audio/disk/SDL_diskaudio.c \
   file/cocoa/SDL_rwopsbundlesupport.m \

ion/src/simulator/external/config.windows.mak

@@ -1,7 +1,7 @@
-SDL_SFLAGS += -Iion/src/sdl/external/sdl/src/video/khronos
+SDL_SFLAGS += -Iion/src/simulator/external/sdl/src/video/khronos
 SDL_SFLAGS += -DHAVE_LIBC
 
-sdl_src += $(addprefix ion/src/sdl/external/sdl/src/, \
+sdl_src += $(addprefix ion/src/simulator/external/sdl/src/, \
   audio/directsound/SDL_directsound.c \
   audio/disk/SDL_diskaudio.c \
   audio/wasapi/SDL_wasapi.c \