File tree Expand file tree Collapse file tree 3 files changed +8
-21
lines changed Expand file tree Collapse file tree 3 files changed +8
-21
lines changed Original file line number Diff line number Diff line change @@ -336,8 +336,6 @@ COMPILER_COMMON=\
336
336
build/compiler/fastbasic.cfg\
337
337
build/compiler/fastbasic-a5200.cfg\
338
338
build/compiler/fastbasic-cart.cfg\
339
- build/compiler/fb$(EXT ) \
340
- build/compiler/fb-int$(EXT ) \
341
339
build/compiler/USAGE.md\
342
340
build/compiler/LICENSE\
343
341
build/compiler/MANUAL.md\
@@ -581,13 +579,15 @@ COMPILER_HOST=\
581
579
$(LD65_HOST ) \
582
580
$(AR65_HOST ) \
583
581
$(FASTBASIC_HOST ) \
582
+ build/bin/fb$(EXT ) \
584
583
585
584
# Target compiler
586
585
COMPILER_TARGET =\
587
586
$(CA65_TARGET ) \
588
587
$(LD65_TARGET ) \
589
588
$(AR65_TARGET ) \
590
589
$(FASTBASIC_TARGET ) \
590
+ build/compiler/fb$(EXT ) \
591
591
592
592
# All ASM Output files
593
593
OBJS =$(RT_OBJS_FP ) \
Original file line number Diff line number Diff line change @@ -127,6 +127,10 @@ $(LD65_TARGET): $(LD65_SRC) | build/compiler
127
127
$(AR65_TARGET ) : $(AR65_SRC ) | build/compiler
128
128
$(ECHO ) " Compile target AR65"
129
129
$(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 $< $@
130
134
endif
131
135
132
136
# Generator for syntax file - 6502 version - FLOAT
@@ -254,11 +258,7 @@ build/compiler/%: compiler/% | build/compiler
254
258
$(Q ) cp -f $< $@
255
259
256
260
# 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 )
262
262
$(Q ) cp -f $< $@
263
263
264
264
# Copy syntax files to compiler folder
Original file line number Diff line number Diff line change @@ -62,19 +62,6 @@ static int show_error(std::string msg)
62
62
return 1 ;
63
63
}
64
64
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
-
78
65
int main (int argc, char **argv)
79
66
{
80
67
auto program_name = std::string (argv[0 ]);
@@ -86,7 +73,7 @@ int main(int argc, char **argv)
86
73
std::string out_name;
87
74
std::string exe_name;
88
75
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 " ;
90
77
std::string cfg_file_def;
91
78
compiler comp;
92
79
std::vector<std::string> link_opts;
You can’t perform that action at this time.
0 commit comments