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

Comparing BasiliskII/src/Windows/Makefile.in (file contents):
Revision 1.2 by gbeauche, 2005-03-24T23:13:09Z vs.
Revision 1.3 by gbeauche, 2005-06-20T08:43:50Z

# Line 15 | Line 15 | KEYCODES = ../SDL/keycodes
15  
16   DESTDIR =
17  
18 + SDL_CFLAGS = @SDL_CFLAGS@
19 + SDL_LIBS = @SDL_LIBS@
20 + WANT_GTK = @WANT_GTK@
21 + GTK_CFLAGS = @GTK_CFLAGS@
22 + GTK_LIBS = @GTK_LIBS@
23 +
24   LN_S = @LN_S@
25   WINDRES = @WINDRES@
26   CC = @CC@
27   CXX = @CXX@
28 < CFLAGS = @CFLAGS@
29 < CXXFLAGS = @CXXFLAGS@
28 > CFLAGS = @CFLAGS@ $(SDL_CFLAGS)
29 > CXXFLAGS = @CXXFLAGS@ $(SDL_CFLAGS)
30   CPPFLAGS = @CPPFLAGS@ -I../include -I. @CPUINCLUDES@
31   DEFS = @DEFS@ @DEFINES@
32   LDFLAGS = @LDFLAGS@
# Line 45 | Line 51 | ROUTERSRCS =  router/arp.cpp router/dump
51   SRCS = ../main.cpp main_windows.cpp ../prefs.cpp ../prefs_items.cpp prefs_windows.cpp \
52      sys_windows.cpp ../rom_patches.cpp ../slot_rom.cpp ../rsrc_patches.cpp \
53      ../emul_op.cpp ../macos_util.cpp ../xpram.cpp xpram_windows.cpp ../timer.cpp \
54 <    timer_windows.cpp ../adb.cpp ../serial.cpp ../dummy/serial_dummy.cpp \
54 >    timer_windows.cpp ../adb.cpp ../serial.cpp serial_windows.cpp \
55      ../ether.cpp ether_windows.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp \
56      ../scsi.cpp ../dummy/scsi_dummy.cpp ../video.cpp ../SDL/video_sdl.cpp \
57      video_blit.cpp ../audio.cpp ../SDL/audio_sdl.cpp clip_windows.cpp \
# Line 54 | Line 60 | SRCS = ../main.cpp main_windows.cpp ../p
60      ../dummy/prefs_editor_dummy.cpp BasiliskII.rc \
61      $(CDENABLESRCS) $(ROUTERSRCS) $(CPUSRCS)
62  
63 + UI_SRCS = ../prefs.cpp prefs_windows.cpp prefs_editor_gtk.cpp xpram_windows.cpp \
64 +        ../prefs_items.cpp ../user_strings.cpp user_strings_windows.cpp BasiliskIIGUI.rc
65 +
66 + UI_APP = BasiliskIIGUI.exe
67 +
68   APP = BasiliskII.exe
69  
70 + PROGS = $(APP)
71 +
72 + ifeq ($(WANT_GTK),yes)
73 + PROGS += $(UI_APP)
74 + endif
75 +
76   ## Rules
77   .PHONY: modules install installdirs uninstall mostlyclean clean distclean depend dep
78   .SUFFIXES:
79   .SUFFIXES: .c .cpp .s .o .h
80  
81 < all: $(APP)
81 > all: $(PROGS)
82  
83   $(UNIXSRCS): %: ../Unix/%
84          $(LN_S) $< $@
# Line 76 | Line 93 | define SRCS_LIST_TO_OBJS
93   endef
94   OBJS = $(SRCS_LIST_TO_OBJS)
95  
96 + define UI_SRCS_LIST_TO_OBJS
97 +        $(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(UI_SRCS), \
98 +        $(basename $(notdir $(file))))))
99 + endef
100 + UI_OBJS = $(UI_SRCS_LIST_TO_OBJS)
101 +
102   SRC_PATHS += $(sort $(foreach file, $(SRCS), $(dir $(file))))
103   VPATH :=
104   VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS))))
105  
106   $(APP): $(UNIXSRCS) $(OBJ_DIR) $(OBJS)
107 <        $(CXX) -o $(APP) $(LDFLAGS) $(OBJS) $(LIBS)
107 >        $(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(SDL_LIBS)
108 >
109 > $(UI_APP): $(UNIXSRCS) $(OBJ_DIR) $(UI_OBJS)
110 >        $(CXX) -o $@ $(LDFLAGS) $(UI_OBJS) $(LIBS) $(GTK_LIBS) -mwindows -mno-cygwin
111  
112   mostlyclean:
113 <        rm -f $(APP)$(EXEEXT) $(OBJ_DIR)/* core* *.core *~ *.bak
113 >        rm -f $(APP) $(UI_APP) $(OBJ_DIR)/* core* *.core *~ *.bak
114  
115   clean: mostlyclean
116          rm -f $(UNIXSRCS)
# Line 109 | Line 135 | $(OBJ_DIR)/%.o : %.cpp
135          $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
136   $(OBJ_DIR)/%.o : %.s
137          $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
138 + $(OBJ_DIR)/prefs_editor_gtk.o: prefs_editor_gtk.cpp
139 +        $(CXX) -O2 -mno-cygwin -mms-bitfields $(CPPFLAGS) $(DEFS) $(GTK_CFLAGS) -c $< -o $@
140  
141   # Windows resources
142   $(OBJ_DIR)/%.o: %.rc

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines