Skip to content

Commit 843dc26

Browse files
Fabrizio-CarusoFabrizio-Caruso
committed
Handle ack options
1 parent 7e2a582 commit 843dc26

File tree

5 files changed

+92
-116
lines changed

5 files changed

+92
-116
lines changed

‎src/config.ini‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,106 +2,109 @@
22

33
# gnu_make name (usually "make" but "gmake" on FreeBSD")
44
# auto -> automatic heuristic detection
5-
gnu_make = auto
5+
gnu_make = auto
66

77
# Maximum number of threads to be used when building
8-
compilation_threads = auto
8+
compilation_threads = auto
99

1010
# Parallel build of different projects (i.e. games/examples)
1111
parallelize_multi_build = 1
1212

13-
z88dk_compiler = sccz80
13+
z88dk_compiler = sccz80
1414
# sccz80
1515
# zsdcc
1616
# clang [experimental]
1717

1818
# Z88DK common optimization options
19-
z88dk_compiler_opts =
19+
z88dk_compiler_opts =
2020
#-compiler=sdcc -SO3 --max-allocs-per-node200000
2121
#-O3
2222

2323
# SCCZ80-specific compiler options
24-
sccz80_compiler_opts = -O3
24+
sccz80_compiler_opts = -O3
2525

2626
# ZSDCC-specific (Z88DK) optimization options for ZSDCC targets
27-
zsdcc_compiler_opts = -SO3 --max-allocs-per-node200000
27+
zsdcc_compiler_opts = -SO3 --max-allocs-per-node200000
2828
# --opt-code-size -SO3 --max-allocs-per-node200000
2929
# -SO3 --max-allocs-per-node200000
3030
# --opt-code-size
3131

3232
# CMOC optimization options
33-
cmoc_compiler_opts = -O2
33+
cmoc_compiler_opts = -O2
3434
#--verbose
3535
#-fomit-frame-pointer
3636

3737
# CC65 optimization options
38-
cc65_compiler_opts = -Or -Cl
38+
cc65_compiler_opts = -Or -Cl
3939

4040
# LCC1802 optimization options
41-
lcc1802_compiler_opts = "-Wf-volatile" -O "-Wp-D nofloats" "-Wa-D LCCNOLONG" "-Wf-mulcall"
41+
lcc1802_compiler_opts = "-Wf-volatile" -O "-Wp-D nofloats" "-Wa-D LCCNOLONG" "-Wf-mulcall"
4242

4343
# GCC for TI99/4A options
4444
# -O2
4545
# -O1
4646
# -Os
4747
# -fno-peephole2 -fno-function-cse
48-
gcc4ti99_compiler_opts = -O2 -fno-peephole2 -fno-function-cse
48+
gcc4ti99_compiler_opts = -O2 -fno-peephole2 -fno-function-cse
4949

5050
# VBCC options
51-
vbcc_compiler_opts = -O1
51+
vbcc_compiler_opts = -O1
52+
53+
# ACK options
54+
ack_compiler_opts = -O6
5255

5356
# Native compiler options
54-
native_compiler_opts = -Wpedantic -Wall
57+
native_compiler_opts = -Wpedantic -Wall
5558

5659
# Compiler use to build native builds
5760
# Remark: Under cygwin, gcc targets the cygwin environment and not Windows
58-
native_compiler = gcc
61+
native_compiler = gcc
5962

6063
# Flag to toggle tools when building
6164
# 0 -> targets won't use tools to create easy to use disk/tape/cartridge images so that raw or simpler binaries are produced
6265
# 1 -> targets that need tools will use tools to create easy to use disk/tape/cartridge images
63-
use_tools = 1
66+
use_tools = 1
6467

6568
# Compiler to use for tools that are built by a C compiler
66-
tool_compiler = gcc
69+
tool_compiler = gcc
6770

6871

6972
[extend]
7073

7174
# How to approximate tiles with more rows
7275
# duplicate -> duplicate adjacent row
7376
# zero -> add zero row(s)
74-
extend_algorithm = duplicate
77+
extend_algorithm = duplicate
7578

7679
# Location of generated non-8x8 pixel shapes
7780
# 0 -> write in _shapes directory,
7881
# 1 -> write in shapes directory but avoid overwriting existing shapes or tiles
79-
replace_shapes = 1
82+
replace_shapes = 1
8083

8184

8285
[run]
8386

8487
# If empty, we assume the emulator path is in PATH environment variable
85-
vice_path =
88+
vice_path =
8689

8790
# If empty, vice searches its default path (OS-dependent)
88-
vice_rom_path = ../roms/vice/
91+
vice_rom_path = ../roms/vice/
8992

9093
# If empty, we assume the emulator path is in the PATH environment variable
91-
mame_path =
94+
mame_path =
9295
#e.g., /cygdrive/c/Retro/Emulators/Mame0251/
9396

9497
# If empty, mame searches the current directory (which should be wrong)
95-
mame_rom_path = ../roms/mame/
98+
mame_rom_path = ../roms/mame/
9699
#e.g., 'c:\\Retro\\Emulators\\Mame0251\\roms\\'
97100

98101

99102
[terminal]
100103

101-
color_terminal = 1
104+
color_terminal = 1
102105

103-
verbose = 1
106+
verbose = 1
104107

105-
fast_test = 0
108+
fast_test = 0
106109

107-
interactive_test = 0
110+
interactive_test = 0

‎src/makefiles.common/auxiliary/Makefile_compilers‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
###########################
66
# ACK
77
_ACK ?= ack $(GLOBAL_OPTS)
8-
_ACK_OPTS ?= -O6
8+
_ACK_OPTS ?=
99

1010

1111

‎src/makefiles.common/targets/ack/Makefile.ack_targets‎

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,9 @@ ack_targets: \
1414
############################################################################################
1515

1616

17-
# pc8086: pc8086_tiny_buffered
18-
pc8086_tiny_buffered:
19-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mpc86 \
20-
-DXSize=20 \
21-
-DYSize=20 \
22-
-D__ADM3A \
23-
-D_XL_NO_COLOR \
24-
-DACK -D_XL_NO_JOYSTICK \
25-
-D__PC8086__ \
26-
-DTINY_GAME \
27-
-DTURN_BASED \
28-
-D__BUFFERED_GRAPHICS \
29-
-D__NO_INIT_GRAPHICS \
30-
-D__NO_PRINT \
31-
-D__NO_WAIT \
32-
-D_XL_NO_SLEEP \
33-
-D__DEFAULT_CLEAR_SCREEN \
34-
$(TINY_FILES)
35-
mv pc86.img $(BUILD_PATH)/TINY_pc8086_turn_based.img
3617

3718
cpm_8080_buffered_ack:
38-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mcpm \
19+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mcpm \
3920
-DXSize=39 \
4021
-DYSize=23 \
4122
-D__ADM3A \
@@ -58,7 +39,7 @@ cpm_8080_buffered_ack:
5839

5940

6041
cpm_8080_adm3a_ack:
61-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mcpm \
42+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mcpm \
6243
-DXSize=78 \
6344
-DYSize=22 \
6445
-D__ADM3A \
@@ -78,9 +59,11 @@ cpm_8080_adm3a_ack:
7859
cpm_8080_ack_targets: \
7960
cpm_8080_buffered_ack
8061

62+
63+
# $(ACK_MAKEFILE_COMPILATION_OPTS)
8164
msdos: msdos86
8265
msdos86: $(ASSETS_PATH)/8x8_chars.h
83-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mmsdos86 \
66+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mmsdos86 \
8467
-DXSize=40 \
8568
-DYSize=25 \
8669
-DACK \
@@ -102,7 +85,7 @@ msdos86: $(ASSETS_PATH)/8x8_chars.h
10285

10386
# BROKEN
10487
msdos386: $(ASSETS_PATH)/8x8_chars.h
105-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mmsdos386 \
88+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mmsdos386 \
10689
-DXSize=40 \
10790
-DYSize=25 \
10891
-DACK \
@@ -127,7 +110,7 @@ pc8088: pc86
127110
pc8086: pc86
128111

129112
pc86: $(ASSETS_PATH)/8x8_chars.h
130-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mpc86 \
113+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mpc86 \
131114
-DXSize=40 \
132115
-DYSize=25 \
133116
-DACK \
@@ -147,36 +130,13 @@ pc86: $(ASSETS_PATH)/8x8_chars.h
147130
rm $(SOURCE_PATH)/../../*.o
148131

149132

150-
151-
# buffered
152-
# pc8086_buffered:
153-
# $(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mpc86 \
154-
# -DXSize=78 \
155-
# -DYSize=22 \
156-
# -D__ADM3A \
157-
# -D_XL_NO_COLOR \
158-
# -DACK \
159-
# -D__PC8086__ \
160-
# -D_XL_NO_JOYSTICK \
161-
# -DTURN_BASED \
162-
# -D__BUFFERED_GRAPHICS \
163-
# -D__NO_INIT_GRAPHICS \
164-
# -D__NO_WAIT \
165-
# -D_XL_NO_SLEEP \
166-
# -D__DEFAULT_CLEAR_SCREEN \
167-
# -D__ALT_PRINT \
168-
# $(FULL_FILES) \
169-
# $(CROSS_LIB_PATH)/display/alt_print/memory_mapped_alt_print.c
170-
# mv pc86.img $(BUILD_PATH)/X$(GAME_NAME)_$@.img
171-
# rm $(SOURCE_PATH)/../../*.o
172-
173133
pc8086_targets: \
174134
pc8086
175135

176136

177137
# buffered
178138
linuxppc:
179-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mlinuxppc \
139+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mlinuxppc \
180140
-DXSize=78 \
181141
-DYSize=21 \
182142
-D__ADM3A \
@@ -202,7 +162,7 @@ linuxppc_targets: \
202162

203163
#buffered
204164
linux68k:
205-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mlinux68k \
165+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mlinux68k \
206166
-DXSize=78 \
207167
-DYSize=21 \
208168
-D__ADM3A \
@@ -228,7 +188,7 @@ linux68k_targets: \
228188

229189
# buffered
230190
linux386:
231-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mlinux386 \
191+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mlinux386 \
232192
-DXSize=78 \
233193
-DYSize=21 \
234194
-D__ADM3A \
@@ -254,7 +214,7 @@ linux386_targets: \
254214

255215
# buffered
256216
linuxmips:
257-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -mlinuxmips \
217+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -mlinuxmips \
258218
-DXSize=78 \
259219
-DYSize=21 \
260220
-D__ADM3A \
@@ -280,7 +240,7 @@ linuxmips_targets: \
280240

281241
# no ncurses in ACK
282242
dos:
283-
$(_ACK) $(_ACK_OPTS) $(INCLUDE_OPTS) -pc86 \
243+
$(_ACK) $(_ACK_OPTS) $(ACK_MAKEFILE_COMPILATION_OPTS) $(INCLUDE_OPTS) -pc86 \
284244
-D__DOS__ \
285245
\
286246
-D_XL_NO_JOYSTICK \

‎src/modules/build_functions.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def multiple_size_build(option_config, mypath,target,xsize,ysize,debug):
6868
lcc1802_compiler_opts, \
6969
gcc4ti99_compiler_opts, \
7070
vbcc_compiler_opts, \
71+
ack_compiler_opts, \
7172
native_compiler_opts, \
7273
native_compiler, \
7374
tool_compiler, \
@@ -165,6 +166,7 @@ def multiple_build(option_config, mypath,target,threads,zsdcc_extra_optimization
165166
lcc1802_compiler_opts, \
166167
gcc4ti99_compiler_opts, \
167168
vbcc_compiler_opts, \
169+
ack_compiler_opts, \
168170
native_compiler_opts, \
169171
native_compiler, \
170172
tool_compiler, \
@@ -371,6 +373,7 @@ def build(option_config, params, reset_flag = False):
371373
lcc1802_compiler_opts, \
372374
gcc4ti99_compiler_opts, \
373375
vbcc_compiler_opts, \
376+
ack_compiler_opts, \
374377
native_compiler_opts, \
375378
native_compiler, \
376379
tool_compiler, \
@@ -421,6 +424,7 @@ def build(option_config, params, reset_flag = False):
421424
print("lcc1802_compiler_opts : " + lcc1802_compiler_opts)
422425
print("gcc4ti99_compiler_opts : " + gcc4ti99_compiler_opts)
423426
print("vbcc_compiler_opts : " + vbcc_compiler_opts)
427+
print("ack_compiler_opts : " + ack_compiler_opts)
424428
print("native_compiler_opts : " + native_compiler_opts)
425429

426430
print("")

0 commit comments

Comments
 (0)