From d70bad84f3a82b8e0a0027a8dffab6c892ace8ea Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Wed, 18 Sep 2019 14:00:51 +0200 Subject: [PATCH] Rename the scripts folder to build And the build folder to output --- .gitignore | 6 +++--- Makefile | 8 ++++---- {scripts => build}/config.mak | 6 +++--- {scripts => build}/defaults.mak | 2 +- {scripts => build}/device/dfu.py | 0 {scripts => build}/device/elf2dfu.py | 0 {scripts => build}/device/gdb_script.gdb | 0 {scripts => build}/device/memory_map.awk | 0 {scripts => build}/device/openocd.n0100.cfg | 0 {scripts => build}/device/openocd.n0110.cfg | 0 {scripts => build}/device/usb/__init__.py | 0 {scripts => build}/device/usb/_debug.py | 0 {scripts => build}/device/usb/_interop.py | 0 {scripts => build}/device/usb/_lookup.py | 0 {scripts => build}/device/usb/_objfinalizer.py | 0 {scripts => build}/device/usb/backend/__init__.py | 0 {scripts => build}/device/usb/backend/libusb0.py | 0 {scripts => build}/device/usb/backend/libusb1.py | 0 {scripts => build}/device/usb/backend/openusb.py | 0 {scripts => build}/device/usb/control.py | 0 {scripts => build}/device/usb/core.py | 0 {scripts => build}/device/usb/legacy.py | 0 {scripts => build}/device/usb/libloader.py | 0 {scripts => build}/device/usb/util.py | 0 {scripts => build}/platform.blackbox.mak | 0 {scripts => build}/platform.device.mak | 4 ++-- {scripts => build}/platform.device.n0100.mak | 0 {scripts => build}/platform.device.n0110.mak | 0 {scripts => build}/platform.emscripten.mak | 0 {scripts => build}/platform.sdl.android.mak | 0 {scripts => build}/platform.sdl.ios.mak | 0 {scripts => build}/platform.sdl.macos.mak | 0 {scripts => build}/platform.sdl.mak | 2 +- {scripts => build}/platform.sdl.windows.mak | 0 {scripts => build}/platform.simulator.mak | 0 {scripts => build}/scenario/Makefile | 0 {scripts => build}/struct_layout/Makefile | 6 +++--- {scripts => build}/struct_layout/ast_to_json.rb | 0 {scripts => build}/struct_layout/visualization.html | 0 {scripts => build}/targets.blackbox.mak | 0 {scripts => build}/targets.device.mak | 10 +++++----- {scripts => build}/targets.device.n0100.mak | 4 ++-- {scripts => build}/targets.device.n0110.mak | 6 +++--- {scripts => build}/targets.emscripten.mak | 0 {scripts => build}/targets.sdl.macos.mak | 0 build/targets.sdl.mak | 1 + {scripts => build}/targets.sdl.windows.mak | 0 {scripts => build}/toolchain.afl.mak | 0 {scripts => build}/toolchain.android.mak | 0 {scripts => build}/toolchain.arm-gcc-m4f.mak | 2 +- {scripts => build}/toolchain.arm-gcc-m7f.mak | 2 +- {scripts => build}/toolchain.arm-gcc.mak | 0 {scripts => build}/toolchain.arm-llvm.mak | 0 {scripts => build}/toolchain.emscripten.mak | 0 {scripts => build}/toolchain.host-clang.mak | 0 {scripts => build}/toolchain.host-gcc.mak | 0 {scripts => build}/toolchain.ios.mak | 0 {scripts => build}/toolchain.macos.mak | 0 {scripts => build}/toolchain.mingw.mak | 0 {scripts => build}/toolchain.windows.mak | 0 scripts/targets.sdl.mak | 1 - 61 files changed, 30 insertions(+), 30 deletions(-) rename {scripts => build}/config.mak (84%) rename {scripts => build}/defaults.mak (95%) rename {scripts => build}/device/dfu.py (100%) rename {scripts => build}/device/elf2dfu.py (100%) rename {scripts => build}/device/gdb_script.gdb (100%) rename {scripts => build}/device/memory_map.awk (100%) rename {scripts => build}/device/openocd.n0100.cfg (100%) rename {scripts => build}/device/openocd.n0110.cfg (100%) rename {scripts => build}/device/usb/__init__.py (100%) rename {scripts => build}/device/usb/_debug.py (100%) rename {scripts => build}/device/usb/_interop.py (100%) rename {scripts => build}/device/usb/_lookup.py (100%) rename {scripts => build}/device/usb/_objfinalizer.py (100%) rename {scripts => build}/device/usb/backend/__init__.py (100%) rename {scripts => build}/device/usb/backend/libusb0.py (100%) rename {scripts => build}/device/usb/backend/libusb1.py (100%) rename {scripts => build}/device/usb/backend/openusb.py (100%) rename {scripts => build}/device/usb/control.py (100%) rename {scripts => build}/device/usb/core.py (100%) rename {scripts => build}/device/usb/legacy.py (100%) rename {scripts => build}/device/usb/libloader.py (100%) rename {scripts => build}/device/usb/util.py (100%) rename {scripts => build}/platform.blackbox.mak (100%) rename {scripts => build}/platform.device.mak (55%) rename {scripts => build}/platform.device.n0100.mak (100%) rename {scripts => build}/platform.device.n0110.mak (100%) rename {scripts => build}/platform.emscripten.mak (100%) rename {scripts => build}/platform.sdl.android.mak (100%) rename {scripts => build}/platform.sdl.ios.mak (100%) rename {scripts => build}/platform.sdl.macos.mak (100%) rename {scripts => build}/platform.sdl.mak (81%) rename {scripts => build}/platform.sdl.windows.mak (100%) rename {scripts => build}/platform.simulator.mak (100%) rename {scripts => build}/scenario/Makefile (100%) rename {scripts => build}/struct_layout/Makefile (69%) rename {scripts => build}/struct_layout/ast_to_json.rb (100%) rename {scripts => build}/struct_layout/visualization.html (100%) rename {scripts => build}/targets.blackbox.mak (100%) rename {scripts => build}/targets.device.mak (93%) rename {scripts => build}/targets.device.n0100.mak (59%) rename {scripts => build}/targets.device.n0110.mak (81%) rename {scripts => build}/targets.emscripten.mak (100%) rename {scripts => build}/targets.sdl.macos.mak (100%) create mode 100644 build/targets.sdl.mak rename {scripts => build}/targets.sdl.windows.mak (100%) rename {scripts => build}/toolchain.afl.mak (100%) rename {scripts => build}/toolchain.android.mak (100%) rename {scripts => build}/toolchain.arm-gcc-m4f.mak (71%) rename {scripts => build}/toolchain.arm-gcc-m7f.mak (71%) rename {scripts => build}/toolchain.arm-gcc.mak (100%) rename {scripts => build}/toolchain.arm-llvm.mak (100%) rename {scripts => build}/toolchain.emscripten.mak (100%) rename {scripts => build}/toolchain.host-clang.mak (100%) rename {scripts => build}/toolchain.host-gcc.mak (100%) rename {scripts => build}/toolchain.ios.mak (100%) rename {scripts => build}/toolchain.macos.mak (100%) rename {scripts => build}/toolchain.mingw.mak (100%) rename {scripts => build}/toolchain.windows.mak (100%) delete mode 100644 scripts/targets.sdl.mak diff --git a/.gitignore b/.gitignore index 908a20cf7..c44032f52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -build -scripts/device/elf2dfu.pyc -scripts/device/**/*.pyc +output +build/device/elf2dfu.pyc +build/device/**/*.pyc diff --git a/Makefile b/Makefile index 54f196361..d3a3bdebf 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -include scripts/config.mak +include build/config.mak # Disable default Make rules .SUFFIXES: @@ -131,8 +131,8 @@ include python/Makefile include escher/Makefile # Executable Makefiles include apps/Makefile -include scripts/struct_layout/Makefile -include scripts/scenario/Makefile +include build/struct_layout/Makefile +include build/scenario/Makefile include quiz/Makefile # Quiz needs to be included at the end all_src = app_src escher_src ion_src kandinsky_src liba_src libaxx_src poincare_src python_src ion_device_dfu_relocated_src ion_device_dfu_xip epsilon_src runner_src flasher_src bench_src tests_src @@ -162,7 +162,7 @@ $(BUILD_DIR)/test.$(EXE): $(BUILD_DIR)/quiz/src/tests_symbols.o $(call object_fo # Load platform-specific targets # We include them before the standard ones to give them precedence. --include scripts/targets.$(PLATFORM).mak +-include build/targets.$(PLATFORM).mak $(foreach extension,$(extensions),$(foreach executable,$(executables),$(eval $(call rules_for_targets,$(executable),$(extension))))) diff --git a/scripts/config.mak b/build/config.mak similarity index 84% rename from scripts/config.mak rename to build/config.mak index e6c477695..6edbbe1ea 100644 --- a/scripts/config.mak +++ b/build/config.mak @@ -10,15 +10,15 @@ EPSILON_I18N ?= en fr es de pt EPSILON_GETOPT ?= 0 ESCHER_LOG_EVENTS_BINARY ?= 0 -include scripts/defaults.mak -include scripts/platform.$(PLATFORM).mak +include build/defaults.mak +include build/platform.$(PLATFORM).mak ifndef USE_LIBA $(error platform.mak should define USE_LIBA) endif ifndef EXE $(error platform.mak should define EXE, the extension for executables) endif -include scripts/toolchain.$(TOOLCHAIN).mak +include build/toolchain.$(TOOLCHAIN).mak SFLAGS += -DDEBUG=$(DEBUG) SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT) diff --git a/scripts/defaults.mak b/build/defaults.mak similarity index 95% rename from scripts/defaults.mak rename to build/defaults.mak index 623e9d658..fb3d78226 100644 --- a/scripts/defaults.mak +++ b/build/defaults.mak @@ -40,4 +40,4 @@ ifeq ($(DEBUG),1) else MODE = release endif -BUILD_DIR = build/$(MODE)/$(PLATFORM) +BUILD_DIR = output/$(PLATFORM)/$(MODE) diff --git a/scripts/device/dfu.py b/build/device/dfu.py similarity index 100% rename from scripts/device/dfu.py rename to build/device/dfu.py diff --git a/scripts/device/elf2dfu.py b/build/device/elf2dfu.py similarity index 100% rename from scripts/device/elf2dfu.py rename to build/device/elf2dfu.py diff --git a/scripts/device/gdb_script.gdb b/build/device/gdb_script.gdb similarity index 100% rename from scripts/device/gdb_script.gdb rename to build/device/gdb_script.gdb diff --git a/scripts/device/memory_map.awk b/build/device/memory_map.awk similarity index 100% rename from scripts/device/memory_map.awk rename to build/device/memory_map.awk diff --git a/scripts/device/openocd.n0100.cfg b/build/device/openocd.n0100.cfg similarity index 100% rename from scripts/device/openocd.n0100.cfg rename to build/device/openocd.n0100.cfg diff --git a/scripts/device/openocd.n0110.cfg b/build/device/openocd.n0110.cfg similarity index 100% rename from scripts/device/openocd.n0110.cfg rename to build/device/openocd.n0110.cfg diff --git a/scripts/device/usb/__init__.py b/build/device/usb/__init__.py similarity index 100% rename from scripts/device/usb/__init__.py rename to build/device/usb/__init__.py diff --git a/scripts/device/usb/_debug.py b/build/device/usb/_debug.py similarity index 100% rename from scripts/device/usb/_debug.py rename to build/device/usb/_debug.py diff --git a/scripts/device/usb/_interop.py b/build/device/usb/_interop.py similarity index 100% rename from scripts/device/usb/_interop.py rename to build/device/usb/_interop.py diff --git a/scripts/device/usb/_lookup.py b/build/device/usb/_lookup.py similarity index 100% rename from scripts/device/usb/_lookup.py rename to build/device/usb/_lookup.py diff --git a/scripts/device/usb/_objfinalizer.py b/build/device/usb/_objfinalizer.py similarity index 100% rename from scripts/device/usb/_objfinalizer.py rename to build/device/usb/_objfinalizer.py diff --git a/scripts/device/usb/backend/__init__.py b/build/device/usb/backend/__init__.py similarity index 100% rename from scripts/device/usb/backend/__init__.py rename to build/device/usb/backend/__init__.py diff --git a/scripts/device/usb/backend/libusb0.py b/build/device/usb/backend/libusb0.py similarity index 100% rename from scripts/device/usb/backend/libusb0.py rename to build/device/usb/backend/libusb0.py diff --git a/scripts/device/usb/backend/libusb1.py b/build/device/usb/backend/libusb1.py similarity index 100% rename from scripts/device/usb/backend/libusb1.py rename to build/device/usb/backend/libusb1.py diff --git a/scripts/device/usb/backend/openusb.py b/build/device/usb/backend/openusb.py similarity index 100% rename from scripts/device/usb/backend/openusb.py rename to build/device/usb/backend/openusb.py diff --git a/scripts/device/usb/control.py b/build/device/usb/control.py similarity index 100% rename from scripts/device/usb/control.py rename to build/device/usb/control.py diff --git a/scripts/device/usb/core.py b/build/device/usb/core.py similarity index 100% rename from scripts/device/usb/core.py rename to build/device/usb/core.py diff --git a/scripts/device/usb/legacy.py b/build/device/usb/legacy.py similarity index 100% rename from scripts/device/usb/legacy.py rename to build/device/usb/legacy.py diff --git a/scripts/device/usb/libloader.py b/build/device/usb/libloader.py similarity index 100% rename from scripts/device/usb/libloader.py rename to build/device/usb/libloader.py diff --git a/scripts/device/usb/util.py b/build/device/usb/util.py similarity index 100% rename from scripts/device/usb/util.py rename to build/device/usb/util.py diff --git a/scripts/platform.blackbox.mak b/build/platform.blackbox.mak similarity index 100% rename from scripts/platform.blackbox.mak rename to build/platform.blackbox.mak diff --git a/scripts/platform.device.mak b/build/platform.device.mak similarity index 55% rename from scripts/platform.device.mak rename to build/platform.device.mak index c4e7c5e24..60559e357 100644 --- a/scripts/platform.device.mak +++ b/build/platform.device.mak @@ -2,8 +2,8 @@ MODEL ?= n0110 USE_LIBA = 1 EXE = elf -BUILD_DIR = build/$(MODE)/$(PLATFORM)/$(MODEL) +BUILD_DIR := $(BUILD_DIR)/$(MODEL) $(BUILD_DIR)/python/port/port.o: CXXFLAGS += -DMP_PORT_USE_STACK_SYMBOLS=1 -include scripts/platform.device.$(MODEL).mak +include build/platform.device.$(MODEL).mak diff --git a/scripts/platform.device.n0100.mak b/build/platform.device.n0100.mak similarity index 100% rename from scripts/platform.device.n0100.mak rename to build/platform.device.n0100.mak diff --git a/scripts/platform.device.n0110.mak b/build/platform.device.n0110.mak similarity index 100% rename from scripts/platform.device.n0110.mak rename to build/platform.device.n0110.mak diff --git a/scripts/platform.emscripten.mak b/build/platform.emscripten.mak similarity index 100% rename from scripts/platform.emscripten.mak rename to build/platform.emscripten.mak diff --git a/scripts/platform.sdl.android.mak b/build/platform.sdl.android.mak similarity index 100% rename from scripts/platform.sdl.android.mak rename to build/platform.sdl.android.mak diff --git a/scripts/platform.sdl.ios.mak b/build/platform.sdl.ios.mak similarity index 100% rename from scripts/platform.sdl.ios.mak rename to build/platform.sdl.ios.mak diff --git a/scripts/platform.sdl.macos.mak b/build/platform.sdl.macos.mak similarity index 100% rename from scripts/platform.sdl.macos.mak rename to build/platform.sdl.macos.mak diff --git a/scripts/platform.sdl.mak b/build/platform.sdl.mak similarity index 81% rename from scripts/platform.sdl.mak rename to build/platform.sdl.mak index 786cb5069..9e0d3055d 100644 --- a/scripts/platform.sdl.mak +++ b/build/platform.sdl.mak @@ -11,4 +11,4 @@ endif BUILD_DIR := $(BUILD_DIR)/$(MODEL) -include scripts/platform.sdl.$(MODEL).mak +include build/platform.sdl.$(MODEL).mak diff --git a/scripts/platform.sdl.windows.mak b/build/platform.sdl.windows.mak similarity index 100% rename from scripts/platform.sdl.windows.mak rename to build/platform.sdl.windows.mak diff --git a/scripts/platform.simulator.mak b/build/platform.simulator.mak similarity index 100% rename from scripts/platform.simulator.mak rename to build/platform.simulator.mak diff --git a/scripts/scenario/Makefile b/build/scenario/Makefile similarity index 100% rename from scripts/scenario/Makefile rename to build/scenario/Makefile diff --git a/scripts/struct_layout/Makefile b/build/struct_layout/Makefile similarity index 69% rename from scripts/struct_layout/Makefile rename to build/struct_layout/Makefile index df5ec0241..1d15f379a 100644 --- a/scripts/struct_layout/Makefile +++ b/build/struct_layout/Makefile @@ -1,4 +1,4 @@ -products += apps/main.ast scripts/struct_layout/data.json +products += apps/main.ast build/struct_layout/data.json .PHONY: apps_container_struct_layout OPEN = open @@ -11,10 +11,10 @@ ifeq ($(CXX),clang++) %.ast.json: %.ast @echo "JSON $@" - @cat $< | ruby scripts/struct_layout/ast_to_json.rb AppsContainer > $@ + @cat $< | ruby build/struct_layout/ast_to_json.rb AppsContainer > $@ apps_container_struct_layout: apps/main.ast.json - $(OPEN) scripts/struct_layout/visualization.html + $(OPEN) build/struct_layout/visualization.html else diff --git a/scripts/struct_layout/ast_to_json.rb b/build/struct_layout/ast_to_json.rb similarity index 100% rename from scripts/struct_layout/ast_to_json.rb rename to build/struct_layout/ast_to_json.rb diff --git a/scripts/struct_layout/visualization.html b/build/struct_layout/visualization.html similarity index 100% rename from scripts/struct_layout/visualization.html rename to build/struct_layout/visualization.html diff --git a/scripts/targets.blackbox.mak b/build/targets.blackbox.mak similarity index 100% rename from scripts/targets.blackbox.mak rename to build/targets.blackbox.mak diff --git a/scripts/targets.device.mak b/build/targets.device.mak similarity index 93% rename from scripts/targets.device.mak rename to build/targets.device.mak index 820af7ae7..ac5b239ab 100644 --- a/scripts/targets.device.mak +++ b/build/targets.device.mak @@ -1,11 +1,11 @@ -include scripts/targets.device.$(MODEL).mak +include build/targets.device.$(MODEL).mak executables += flasher.light flasher.verbose bench.ram bench.flash extensions += .dfu .hex .bin $(BUILD_DIR)/%.dfu: $(BUILD_DIR)/%.$(EXE) @echo "DFUSE $@" - $(Q) $(PYTHON) scripts/device/elf2dfu.py $< $@ + $(Q) $(PYTHON) build/device/elf2dfu.py $< $@ $(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.$(EXE) @echo "OBJCOPY $@" @@ -30,7 +30,7 @@ $(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.$(EXE) .PHONY: %_run %_run: $(BUILD_DIR)/%.$(EXE) - $(GDB) -x scripts/$(PLATFORM)/gdb_script.gdb $< + $(GDB) -x build/$(PLATFORM)/gdb_script.gdb $< $(BUILD_DIR)/%.map: $(BUILD_DIR)/%.elf @echo "LDMAP $@" @@ -39,12 +39,12 @@ $(BUILD_DIR)/%.map: $(BUILD_DIR)/%.elf .PHONY: %_memory_map %_memory_map: $(BUILD_DIR)/%.map @echo "========== MEMORY MAP =========" - $(Q) awk -f scripts/device/memory_map.awk < $< + $(Q) awk -f build/device/memory_map.awk < $< @echo "===============================" .PHONY: openocd openocd: - openocd -f scripts/$(PLATFORM)/openocd.$(MODEL).cfg + openocd -f build/$(PLATFORM)/openocd.$(MODEL).cfg # The flasher target is defined here because otherwise $(%_src) has not been # fully filled diff --git a/scripts/targets.device.n0100.mak b/build/targets.device.n0100.mak similarity index 59% rename from scripts/targets.device.n0100.mak rename to build/targets.device.n0100.mak index f76072b71..aff59a280 100644 --- a/scripts/targets.device.n0100.mak +++ b/build/targets.device.n0100.mak @@ -3,5 +3,5 @@ @echo "DFU $@" @echo "INFO About to flash your device. Please plug your device to your computer" @echo " using an USB cable and press the RESET button the back of your device." - $(Q) until $(PYTHON) scripts/device/dfu.py -l | grep -E "0483:a291|0483:df11" > /dev/null 2>&1; do sleep 2;done - $(Q) $(PYTHON) scripts/device/dfu.py -m -u $< + $(Q) until $(PYTHON) build/device/dfu.py -l | grep -E "0483:a291|0483:df11" > /dev/null 2>&1; do sleep 2;done + $(Q) $(PYTHON) build/device/dfu.py -m -u $< diff --git a/scripts/targets.device.n0110.mak b/build/targets.device.n0110.mak similarity index 81% rename from scripts/targets.device.n0110.mak rename to build/targets.device.n0110.mak index ad5f1099a..d602f07f8 100644 --- a/scripts/targets.device.n0110.mak +++ b/build/targets.device.n0110.mak @@ -11,7 +11,7 @@ $(BUILD_DIR)/test.external_flash.write.$(EXE): $(BUILD_DIR)/quiz/src/test_ion_ex @echo "INFO About to flash your device. Please plug your device to your computer" @echo " using an USB cable and press at the same time the 6 key and the RESET" @echo " button on the back of your device." - $(Q) until $(PYTHON) scripts/device/dfu.py -l | grep -E "0483:a291|0483:df11" > /dev/null 2>&1; do sleep 2;done - $(Q) $(PYTHON) scripts/device/dfu.py -u $(word 2,$^) | sleep 2 - $(Q) $(PYTHON) scripts/device/dfu.py -u $(word 1,$^) + $(Q) until $(PYTHON) build/device/dfu.py -l | grep -E "0483:a291|0483:df11" > /dev/null 2>&1; do sleep 2;done + $(Q) $(PYTHON) build/device/dfu.py -u $(word 2,$^) | sleep 2 + $(Q) $(PYTHON) build/device/dfu.py -u $(word 1,$^) diff --git a/scripts/targets.emscripten.mak b/build/targets.emscripten.mak similarity index 100% rename from scripts/targets.emscripten.mak rename to build/targets.emscripten.mak diff --git a/scripts/targets.sdl.macos.mak b/build/targets.sdl.macos.mak similarity index 100% rename from scripts/targets.sdl.macos.mak rename to build/targets.sdl.macos.mak diff --git a/build/targets.sdl.mak b/build/targets.sdl.mak new file mode 100644 index 000000000..b322b42c6 --- /dev/null +++ b/build/targets.sdl.mak @@ -0,0 +1 @@ +-include build/targets.sdl.$(MODEL).mak diff --git a/scripts/targets.sdl.windows.mak b/build/targets.sdl.windows.mak similarity index 100% rename from scripts/targets.sdl.windows.mak rename to build/targets.sdl.windows.mak diff --git a/scripts/toolchain.afl.mak b/build/toolchain.afl.mak similarity index 100% rename from scripts/toolchain.afl.mak rename to build/toolchain.afl.mak diff --git a/scripts/toolchain.android.mak b/build/toolchain.android.mak similarity index 100% rename from scripts/toolchain.android.mak rename to build/toolchain.android.mak diff --git a/scripts/toolchain.arm-gcc-m4f.mak b/build/toolchain.arm-gcc-m4f.mak similarity index 71% rename from scripts/toolchain.arm-gcc-m4f.mak rename to build/toolchain.arm-gcc-m4f.mak index 591fd7fbb..5f5ae4056 100644 --- a/scripts/toolchain.arm-gcc-m4f.mak +++ b/build/toolchain.arm-gcc-m4f.mak @@ -1,3 +1,3 @@ -include scripts/toolchain.arm-gcc.mak +include build/toolchain.arm-gcc.mak SFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard SFLAGS += -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 diff --git a/scripts/toolchain.arm-gcc-m7f.mak b/build/toolchain.arm-gcc-m7f.mak similarity index 71% rename from scripts/toolchain.arm-gcc-m7f.mak rename to build/toolchain.arm-gcc-m7f.mak index d22f0c1eb..b23b86b9d 100644 --- a/scripts/toolchain.arm-gcc-m7f.mak +++ b/build/toolchain.arm-gcc-m7f.mak @@ -1,3 +1,3 @@ -include scripts/toolchain.arm-gcc.mak +include build/toolchain.arm-gcc.mak SFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard SFLAGS += -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 diff --git a/scripts/toolchain.arm-gcc.mak b/build/toolchain.arm-gcc.mak similarity index 100% rename from scripts/toolchain.arm-gcc.mak rename to build/toolchain.arm-gcc.mak diff --git a/scripts/toolchain.arm-llvm.mak b/build/toolchain.arm-llvm.mak similarity index 100% rename from scripts/toolchain.arm-llvm.mak rename to build/toolchain.arm-llvm.mak diff --git a/scripts/toolchain.emscripten.mak b/build/toolchain.emscripten.mak similarity index 100% rename from scripts/toolchain.emscripten.mak rename to build/toolchain.emscripten.mak diff --git a/scripts/toolchain.host-clang.mak b/build/toolchain.host-clang.mak similarity index 100% rename from scripts/toolchain.host-clang.mak rename to build/toolchain.host-clang.mak diff --git a/scripts/toolchain.host-gcc.mak b/build/toolchain.host-gcc.mak similarity index 100% rename from scripts/toolchain.host-gcc.mak rename to build/toolchain.host-gcc.mak diff --git a/scripts/toolchain.ios.mak b/build/toolchain.ios.mak similarity index 100% rename from scripts/toolchain.ios.mak rename to build/toolchain.ios.mak diff --git a/scripts/toolchain.macos.mak b/build/toolchain.macos.mak similarity index 100% rename from scripts/toolchain.macos.mak rename to build/toolchain.macos.mak diff --git a/scripts/toolchain.mingw.mak b/build/toolchain.mingw.mak similarity index 100% rename from scripts/toolchain.mingw.mak rename to build/toolchain.mingw.mak diff --git a/scripts/toolchain.windows.mak b/build/toolchain.windows.mak similarity index 100% rename from scripts/toolchain.windows.mak rename to build/toolchain.windows.mak diff --git a/scripts/targets.sdl.mak b/scripts/targets.sdl.mak deleted file mode 100644 index 3414568a2..000000000 --- a/scripts/targets.sdl.mak +++ /dev/null @@ -1 +0,0 @@ --include scripts/targets.sdl.$(MODEL).mak