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.4 by gbeauche, 2005-11-21T22:03:53Z vs.
Revision 1.7 by gbeauche, 2006-04-29T10:57:56Z

# Line 21 | Line 21 | WANT_GTK = @WANT_GTK@
21   GTK_CFLAGS = @GTK_CFLAGS@
22   GTK_LIBS = @GTK_LIBS@
23  
24 + SLIRP_CFLAGS = @SLIRP_CFLAGS@
25 + SLIRP_SRCS = \
26 +    ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
27 +    ../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
28 +    ../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
29 +    ../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
30 +    ../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
31 +    ../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c
32 + SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=$(OBJ_DIR)/slirp-%.o)
33 +
34   LN_S = @LN_S@
35   WINDRES = @WINDRES@
36   CC = @CC@
37   CXX = @CXX@
38   CFLAGS = @CFLAGS@ $(SDL_CFLAGS)
39   CXXFLAGS = @CXXFLAGS@ $(SDL_CFLAGS)
40 < CPPFLAGS = @CPPFLAGS@ -I../include -I. @CPUINCLUDES@
40 > CPPFLAGS = @CPPFLAGS@ -I../include -I. @CPUINCLUDES@ -I../slirp
41   DEFS = @DEFS@ @DEFINES@
42   LDFLAGS = @LDFLAGS@
43 < LIBS = @LIBS@
43 > LIBS = @LIBS@ -lwsock32 -liphlpapi
44   CPUSRCS = @CPUSRCS@
45  
46   HOST_CC = gcc
# Line 58 | Line 68 | SRCS = ../main.cpp main_windows.cpp ../p
68          ../extfs.cpp extfs_windows.cpp ../user_strings.cpp user_strings_windows.cpp \
69      vm_alloc.cpp sigsegv.cpp posix_emu.cpp util_windows.cpp kernel_windows.cpp \
70      ../dummy/prefs_editor_dummy.cpp BasiliskII.rc \
71 <    $(CDENABLESRCS) $(ROUTERSRCS) $(CPUSRCS)
71 >    $(CDENABLESRCS) $(ROUTERSRCS) $(CPUSRCS) $(SLIRP_OBJS)
72  
73   UI_SRCS = ../prefs.cpp prefs_windows.cpp prefs_editor_gtk.cpp xpram_windows.cpp \
74 <        ../prefs_items.cpp ../user_strings.cpp user_strings_windows.cpp BasiliskIIGUI.rc
74 >        ../prefs_items.cpp ../user_strings.cpp user_strings_windows.cpp util_windows.cpp \
75 >        b2ether/Packet32.cpp BasiliskIIGUI.rc
76  
77   UI_APP = BasiliskIIGUI.exe
78  
# Line 129 | Line 140 | $(OBJ_DIR)/%.ho : %.c
140          $(HOST_CC) $(CPPFLAGS) $(DEFS) $(HOST_CFLAGS) -c $< -o $@
141   $(OBJ_DIR)/%.ho : %.cpp
142          $(HOST_CXX) $(CPPFLAGS) $(DEFS) $(HOST_CXXFLAGS) -c $< -o $@
143 + $(OBJ_DIR)/slirp-%.o : ../slirp/%.c
144 +        $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@
145   $(OBJ_DIR)/%.o : %.c
146          $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
147   $(OBJ_DIR)/%.o : %.cpp

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines