ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/Makefile.in
(Generate patch)

Comparing BasiliskII/src/Unix/Makefile.in (file contents):
Revision 1.41 by gbeauche, 2006-04-16T16:32:45Z vs.
Revision 1.42 by gbeauche, 2006-04-16T21:25:41Z

# Line 36 | Line 36 | SLIRP_SRCS = @SLIRP_SRCS@
36   SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=obj/%.o)
37  
38   STANDALONE_GUI = @STANDALONE_GUI@
39 + GUI_CFLAGS = @GUI_CFLAGS@
40 + GUI_LIBS = @GUI_LIBS@
41   GUI_SRCS = ../prefs.cpp prefs_unix.cpp prefs_editor_gtk.cpp ../prefs_items.cpp \
42 <        ../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp
42 >        ../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp rpc_unix.cpp
43  
44   ## Files
45   SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp \
# Line 46 | Line 48 | SRCS = ../main.cpp main_unix.cpp ../pref
48      timer_unix.cpp ../adb.cpp ../serial.cpp ../ether.cpp \
49      ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../video.cpp video_blit.cpp \
50      vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp \
51 <        ../user_strings.cpp user_strings_unix.cpp sshpty.c strlcpy.c \
51 >        ../user_strings.cpp user_strings_unix.cpp sshpty.c strlcpy.c rpc_unix.cpp \
52      $(SYSSRCS) $(CPUSRCS) $(SLIRP_SRCS)
53   APP = BasiliskII
54   APP_APP = $(APP).app
# Line 55 | Line 57 | PROGS = $(APP)$(EXEEXT)
57   ifeq ($(STANDALONE_GUI),yes)
58   GUI_APP = BasiliskIIGUI
59   PROGS += $(GUI_APP)$(EXEEXT)
60 + else
61 + CXXFLAGS += $(GUI_CFLAGS)
62 + LIBS += $(GUI_LIBS)
63   endif
64  
65   ## Rules
# Line 75 | Line 80 | endef
80   OBJS = $(SRCS_LIST_TO_OBJS)
81  
82   define GUI_SRCS_LIST_TO_OBJS
83 <        $(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(GUI_SRCS), \
83 >        $(addprefix $(OBJ_DIR)/, $(addsuffix .go, $(foreach file, $(GUI_SRCS), \
84          $(basename $(notdir $(file))))))
85   endef
86   GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
# Line 89 | Line 94 | $(APP)$(EXEEXT): $(OBJ_DIR) $(OBJS)
94          $(BLESS) $(APP)$(EXEEXT)
95  
96   $(GUI_APP)$(EXEEXT): $(OBJ_DIR) $(GUI_OBJS)
97 <        $(CXX) -o $@ $(LDFLAGS) $(GUI_OBJS) $(LIBS)
97 >        $(CXX) -o $@ $(LDFLAGS) $(GUI_OBJS) $(LIBS) $(GUI_LIBS)
98  
99   $(APP)_app: $(APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
100          mkdir -p $(APP_APP)/Contents
# Line 152 | Line 157 | $(OBJ_DIR)/%.o : %.mm
157          $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
158   $(OBJ_DIR)/%.o : %.s
159          $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
160 + $(OBJ_DIR)/%.go : %.cpp
161 +        $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -c $< -o $@
162  
163   # Windows resources
164   $(OBJ_DIR)/%.o: %.rc

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines