Skip to content

Commit

Permalink
Change GUI object extension, so GCC doesn't think we're Go
Browse files Browse the repository at this point in the history
  • Loading branch information
vasi committed Mar 6, 2014
1 parent a3abfdc commit 4dd7f92
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions BasiliskII/src/Unix/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ OBJS := $(SRCS_LIST_TO_OBJS)
SRCS := $(SRCS:%=@top_srcdir@/%)

define GUI_SRCS_LIST_TO_OBJS
$(addprefix $(OBJ_DIR)/, $(addsuffix .go, $(foreach file, $(GUI_SRCS), \
$(addprefix $(OBJ_DIR)/, $(addsuffix .guio, $(foreach file, $(GUI_SRCS), \
$(basename $(notdir $(file))))))
endef
GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
Expand Down Expand Up @@ -193,7 +193,7 @@ $(OBJ_DIR)/%.o : %.mm
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
$(OBJ_DIR)/%.o : %.s
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
$(OBJ_DIR)/%.go : %.cpp
$(OBJ_DIR)/%.guio : %.cpp
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@

# Windows resources
Expand Down
4 changes: 2 additions & 2 deletions SheepShaver/src/Unix/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ endef
OBJS = $(SRCS_LIST_TO_OBJS)

define GUI_SRCS_LIST_TO_OBJS
$(addprefix $(OBJ_DIR)/, $(addsuffix .go, $(foreach file, $(GUI_SRCS), \
$(addprefix $(OBJ_DIR)/, $(addsuffix .guio, $(foreach file, $(GUI_SRCS), \
$(basename $(notdir $(file))))))
endef
GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
Expand Down Expand Up @@ -195,7 +195,7 @@ $(OBJ_DIR)/%.o : %.S
$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
$(AS) $(ASFLAGS) -o $@ $*.out.s
rm $*.out.s
$(OBJ_DIR)/%.go : %.cpp
$(OBJ_DIR)/%.guio : %.cpp
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@

# Kheperix CPU emulator
Expand Down

0 comments on commit 4dd7f92

Please sign in to comment.