Skip to content

Commit b0c2749

Browse files
committed
Drop support for make build system
1 parent 258c841 commit b0c2749

File tree

21 files changed

+8
-191
lines changed

21 files changed

+8
-191
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The official esp-idf version 3.3 or 4.0 is required and it is recommended to app
8888
sdcard-fix patch located in the tools folder. Both make and cmake are supported.
8989

9090
## Build everything and generate .fw:
91-
1. `python rg_tool.py build-fw` or `python rg_tool.py build-fw --use-make` (legacy make system)
91+
1. `python rg_tool.py build-fw`
9292

9393
For a smaller build you can also specify which apps you want, for example the launcher + nes/gameboy only:
9494
1. `python rg_tool.py build-fw retro-go nofrendo-go gnuboy-go`

base.make

Lines changed: 0 additions & 8 deletions
This file was deleted.

gnuboy-go/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

gnuboy-go/components/gnuboy/component.mk

Lines changed: 0 additions & 10 deletions
This file was deleted.

gnuboy-go/main/component.mk

Lines changed: 0 additions & 10 deletions
This file was deleted.

gnuboy-go/main/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static bool advanced_settings_cb(odroid_dialog_choice_t *option, odroid_dialog_e
177177
if (event == ODROID_DIALOG_ENTER) {
178178
odroid_dialog_choice_t options[] = {
179179
{101, "Set clock", "00:00", 1, &rtc_update_cb},
180-
{102, "Save SRAM", "No", 1, &save_sram_update_cb},
180+
{102, "Auto save SRAM", "No", 1, &save_sram_update_cb},
181181
ODROID_DIALOG_CHOICE_LAST
182182
};
183183
odroid_overlay_dialog("Advanced", options, 0);
@@ -270,7 +270,7 @@ void app_main(void)
270270
{
271271
if (ram.sram_dirty)
272272
{
273-
saveSRAM_Timer = 90;
273+
saveSRAM_Timer = 120; // wait 2 seconds
274274
ram.sram_dirty = 0;
275275
}
276276

handy-go/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

handy-go/components/handy/component.mk

Lines changed: 0 additions & 14 deletions
This file was deleted.

handy-go/main/component.mk

Lines changed: 0 additions & 11 deletions
This file was deleted.

huexpress-go/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

huexpress-go/components/huexpress/component.mk

Lines changed: 0 additions & 13 deletions
This file was deleted.

huexpress-go/main/component.mk

Lines changed: 0 additions & 8 deletions
This file was deleted.

nofrendo-go/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

nofrendo-go/components/nofrendo/component.mk

Lines changed: 0 additions & 13 deletions
This file was deleted.

nofrendo-go/main/component.mk

Lines changed: 0 additions & 10 deletions
This file was deleted.

retro-go/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

retro-go/main/component.mk

Lines changed: 0 additions & 10 deletions
This file was deleted.

rg_tool.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,14 @@ def clean_app(target):
128128
print("Nothing to do.\n")
129129

130130

131-
def build_app(target, use_make=False, with_debugging=False, with_profiling=False, with_netplay=False):
131+
def build_app(target, with_debugging=False, with_profiling=False, with_netplay=False):
132132
# To do: clean up if any of the flags changed since last build
133133
print("Building app '%s'" % target)
134134
os.chdir(os.path.join(PRJ_PATH, target))
135135
os.putenv("ENABLE_PROFILING", "1" if with_profiling else "0")
136136
os.putenv("ENABLE_DEBUGGING", "1" if with_debugging else "0")
137137
os.putenv("ENABLE_NETPLAY", "1" if with_netplay else "0")
138-
if use_make:
139-
subprocess.run(["make", "-j", "6", "app"], shell=True, check=True)
140-
else:
141-
subprocess.run(["idf.py", "app"], shell=True, check=True)
138+
subprocess.run(["idf.py", "app"], shell=True, check=True)
142139

143140
print("Patching esp_image_header_t to skip sha256 on boot...")
144141
with open("build/" + target + ".bin", "r+b") as fp:
@@ -247,9 +244,6 @@ def monitor_app(target, port, baudrate=115200):
247244
parser.add_argument(
248245
"targets", nargs="*", default="all", choices=["all"] + list(PROJECT_APPS.keys())
249246
)
250-
parser.add_argument(
251-
"--use-make", action="store_const", const=True, help="Use legacy make build system"
252-
)
253247
parser.add_argument(
254248
"--compact-fw", action="store_const", const=True, help="Ignore the partition sizes set in rg_config.py when building .fw"
255249
)
@@ -281,12 +275,12 @@ def monitor_app(target, port, baudrate=115200):
281275
if command == "build-fw":
282276
for target in targets:
283277
clean_app(target)
284-
build_app(target, args.use_make, args.with_debugging, args.with_profiling, args.with_netplay)
278+
build_app(target, args.with_debugging, args.with_profiling, args.with_netplay)
285279
build_firmware(targets)
286280

287281
if command == "build":
288282
for target in targets:
289-
build_app(target, args.use_make, args.with_debugging, args.with_profiling, args.with_netplay)
283+
build_app(target,args.with_debugging, args.with_profiling, args.with_netplay)
290284

291285
if command == "clean":
292286
for target in targets:
@@ -300,7 +294,7 @@ def monitor_app(target, port, baudrate=115200):
300294
monitor_app(targets[0], args.port)
301295

302296
if command == "run":
303-
build_app(targets[0], args.use_make, args.with_debugging, args.with_profiling, args.with_netplay)
297+
build_app(targets[0], args.with_debugging, args.with_profiling, args.with_netplay)
304298
flash_app(targets[0], args.port, find_app(targets[0], args.offset, args.app_offset))
305299
monitor_app(targets[0], args.port)
306300

smsplusgx-go/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

smsplusgx-go/components/smsplus/component.mk

Lines changed: 0 additions & 13 deletions
This file was deleted.

smsplusgx-go/main/component.mk

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)