Skip to content

Commit e271a0f

Browse files
committed
Remove fb-int compatibility binary.
With all the new targets, having an "integer only" version does not make sense anymore, so stop creating the binary.
1 parent c7abd55 commit e271a0f

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@ COMPILER_COMMON=\
336336
build/compiler/fastbasic.cfg\
337337
build/compiler/fastbasic-a5200.cfg\
338338
build/compiler/fastbasic-cart.cfg\
339-
build/compiler/fb$(EXT)\
340-
build/compiler/fb-int$(EXT)\
341339
build/compiler/USAGE.md\
342340
build/compiler/LICENSE\
343341
build/compiler/MANUAL.md\
@@ -581,13 +579,15 @@ COMPILER_HOST=\
581579
$(LD65_HOST)\
582580
$(AR65_HOST)\
583581
$(FASTBASIC_HOST)\
582+
build/bin/fb$(EXT)\
584583

585584
# Target compiler
586585
COMPILER_TARGET=\
587586
$(CA65_TARGET)\
588587
$(LD65_TARGET)\
589588
$(AR65_TARGET)\
590589
$(FASTBASIC_TARGET)\
590+
build/compiler/fb$(EXT)\
591591

592592
# All ASM Output files
593593
OBJS=$(RT_OBJS_FP) \

rules.mak

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ $(LD65_TARGET): $(LD65_SRC) | build/compiler
127127
$(AR65_TARGET): $(AR65_SRC) | build/compiler
128128
$(ECHO) "Compile target AR65"
129129
$(Q)$(CROSS)$(CC) $(TARGET_CFLAGS) $(CC65_CFLAGS) -o $@ $^
130+
131+
# Copy compatibility binaries
132+
build/compiler/fb$(EXT): build/compiler/fastbasic$(EXT)
133+
$(Q)cp -f $< $@
130134
endif
131135

132136
# Generator for syntax file - 6502 version - FLOAT
@@ -254,11 +258,7 @@ build/compiler/%: compiler/% | build/compiler
254258
$(Q)cp -f $< $@
255259

256260
# Copy compatibility binaries
257-
build/compiler/fb$(EXT): build/compiler/fastbasic$(EXT)
258-
$(Q)cp -f $< $@
259-
260-
# Copy compatibility binaries
261-
build/compiler/fb-int$(EXT): build/compiler/fastbasic$(EXT)
261+
build/bin/fb$(EXT): build/bin/fastbasic$(EXT)
262262
$(Q)cp -f $< $@
263263

264264
# Copy syntax files to compiler folder

src/compiler/main.cc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,6 @@ static int show_error(std::string msg)
6262
return 1;
6363
}
6464

65-
// Selects a default target based on compiler name
66-
static std::string default_target(const std::string &prog)
67-
{
68-
// Get program filename
69-
auto base = os::file_name(prog);
70-
71-
// Check if contains the word "-int":
72-
if(base.rfind("-int") != base.npos)
73-
return "atari-int";
74-
else
75-
return "default";
76-
}
77-
7865
int main(int argc, char **argv)
7966
{
8067
auto program_name = std::string(argv[0]);
@@ -86,7 +73,7 @@ int main(int argc, char **argv)
8673
std::string out_name;
8774
std::string exe_name;
8875
bool got_outname = false, one_step = false, next_is_output = false;
89-
std::string target_name = default_target(program_name);
76+
std::string target_name = "default";
9077
std::string cfg_file_def;
9178
compiler comp;
9279
std::vector<std::string> link_opts;

0 commit comments

Comments
 (0)