mirror of
https://github.com/kanjitalk755/macemu.git
synced 2025-01-27 07:30:12 +00:00
Change GUI object extension, so GCC doesn't think we're Go
This commit is contained in:
parent
a3abfdc041
commit
4dd7f9236f
@ -93,7 +93,7 @@ OBJS := $(SRCS_LIST_TO_OBJS)
|
|||||||
SRCS := $(SRCS:%=@top_srcdir@/%)
|
SRCS := $(SRCS:%=@top_srcdir@/%)
|
||||||
|
|
||||||
define GUI_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))))))
|
$(basename $(notdir $(file))))))
|
||||||
endef
|
endef
|
||||||
GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
|
GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
|
||||||
@ -193,7 +193,7 @@ $(OBJ_DIR)/%.o : %.mm
|
|||||||
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
|
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
|
||||||
$(OBJ_DIR)/%.o : %.s
|
$(OBJ_DIR)/%.o : %.s
|
||||||
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
|
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
|
||||||
$(OBJ_DIR)/%.go : %.cpp
|
$(OBJ_DIR)/%.guio : %.cpp
|
||||||
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@
|
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@
|
||||||
|
|
||||||
# Windows resources
|
# Windows resources
|
||||||
|
@ -97,7 +97,7 @@ endef
|
|||||||
OBJS = $(SRCS_LIST_TO_OBJS)
|
OBJS = $(SRCS_LIST_TO_OBJS)
|
||||||
|
|
||||||
define GUI_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))))))
|
$(basename $(notdir $(file))))))
|
||||||
endef
|
endef
|
||||||
GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
|
GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
|
||||||
@ -195,7 +195,7 @@ $(OBJ_DIR)/%.o : %.S
|
|||||||
$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
|
$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
|
||||||
$(AS) $(ASFLAGS) -o $@ $*.out.s
|
$(AS) $(ASFLAGS) -o $@ $*.out.s
|
||||||
rm $*.out.s
|
rm $*.out.s
|
||||||
$(OBJ_DIR)/%.go : %.cpp
|
$(OBJ_DIR)/%.guio : %.cpp
|
||||||
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@
|
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@
|
||||||
|
|
||||||
# Kheperix CPU emulator
|
# Kheperix CPU emulator
|
||||||
|
Loading…
x
Reference in New Issue
Block a user