Skip to content

Commit

Permalink
Remove fb-int compatibility binary.
Browse files Browse the repository at this point in the history
With all the new targets, having an "integer only" version does not make
sense anymore, so stop creating the binary.
  • Loading branch information
dmsc committed Mar 1, 2022
1 parent c7abd55 commit e271a0f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,6 @@ COMPILER_COMMON=\
build/compiler/fastbasic.cfg\
build/compiler/fastbasic-a5200.cfg\
build/compiler/fastbasic-cart.cfg\
build/compiler/fb$(EXT)\
build/compiler/fb-int$(EXT)\
build/compiler/USAGE.md\
build/compiler/LICENSE\
build/compiler/MANUAL.md\
Expand Down Expand Up @@ -581,13 +579,15 @@ COMPILER_HOST=\
$(LD65_HOST)\
$(AR65_HOST)\
$(FASTBASIC_HOST)\
build/bin/fb$(EXT)\

# Target compiler
COMPILER_TARGET=\
$(CA65_TARGET)\
$(LD65_TARGET)\
$(AR65_TARGET)\
$(FASTBASIC_TARGET)\
build/compiler/fb$(EXT)\

# All ASM Output files
OBJS=$(RT_OBJS_FP) \
Expand Down
10 changes: 5 additions & 5 deletions rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ $(LD65_TARGET): $(LD65_SRC) | build/compiler
$(AR65_TARGET): $(AR65_SRC) | build/compiler
$(ECHO) "Compile target AR65"
$(Q)$(CROSS)$(CC) $(TARGET_CFLAGS) $(CC65_CFLAGS) -o $@ $^

# Copy compatibility binaries
build/compiler/fb$(EXT): build/compiler/fastbasic$(EXT)
$(Q)cp -f $< $@
endif

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

# Copy compatibility binaries
build/compiler/fb$(EXT): build/compiler/fastbasic$(EXT)
$(Q)cp -f $< $@

# Copy compatibility binaries
build/compiler/fb-int$(EXT): build/compiler/fastbasic$(EXT)
build/bin/fb$(EXT): build/bin/fastbasic$(EXT)
$(Q)cp -f $< $@

# Copy syntax files to compiler folder
Expand Down
15 changes: 1 addition & 14 deletions src/compiler/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@ static int show_error(std::string msg)
return 1;
}

// Selects a default target based on compiler name
static std::string default_target(const std::string &prog)
{
// Get program filename
auto base = os::file_name(prog);

// Check if contains the word "-int":
if(base.rfind("-int") != base.npos)
return "atari-int";
else
return "default";
}

int main(int argc, char **argv)
{
auto program_name = std::string(argv[0]);
Expand All @@ -86,7 +73,7 @@ int main(int argc, char **argv)
std::string out_name;
std::string exe_name;
bool got_outname = false, one_step = false, next_is_output = false;
std::string target_name = default_target(program_name);
std::string target_name = "default";
std::string cfg_file_def;
compiler comp;
std::vector<std::string> link_opts;
Expand Down

0 comments on commit e271a0f

Please sign in to comment.