X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=6dd508e59cc4426cd268f2d131ff8e634aeee2b4;hp=b63b7d2aa431f1cbe14240c157439a2910b32b59;hb=41f8dd670e963aad94527ce2be0486268993a477;hpb=4107dd30ca1a4c7d1a5cd6c0999b9afb5adff779

diff --git a/src/Makefile.am b/src/Makefile.am
index b63b7d2..6dd508e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,8 @@
 
 noinst_LIBRARIES = libmoof.a
 
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
+
 libmoof_a_SOURCES = \
 					Moof/Aabb.cc \
 					Moof/Aabb.hh \
@@ -41,8 +43,11 @@ libmoof_a_SOURCES = \
 					Moof/Manager.hh \
 					Moof/Math.hh \
 					Moof/ModalDialog.hh \
+					Moof/Network.hh \
 					Moof/Octree.hh \
 					Moof/OpenGL.hh \
+					Moof/Packet.cc \
+					Moof/Packet.hh \
 					Moof/Plane.cc \
 					Moof/Plane.hh \
 					Moof/Ray.hh \
@@ -50,9 +55,11 @@ libmoof_a_SOURCES = \
 					Moof/Resource.hh \
 					Moof/RigidBody.hh \
 					Moof/Script.hh \
+					Moof/Service.hh \
 					Moof/Settings.cc \
 					Moof/Settings.hh \
 					Moof/Shape.hh \
+					Moof/Socket.hh \
 					Moof/Sound.cc \
 					Moof/Sound.hh \
 					Moof/Sphere.hh \
@@ -71,8 +78,6 @@ libmoof_a_SOURCES = \
 					Moof/fastevents.h \
 					$(ENDLIST)
 
-libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
-
 EXTRA_DIST = Moof/cml Moof/stlplus
 
 
@@ -82,6 +87,9 @@ EXTRA_DIST = Moof/cml Moof/stlplus
 
 bin_PROGRAMS = yoink
 
+yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
+yoink_LDADD = libmoof.a
+
 yoink_SOURCES = \
 				Animation.cc \
 				Animation.hh \
@@ -111,20 +119,25 @@ yoink_SOURCES = \
 				$(ENDLIST)
 
 if WIN32
-yoink_SOURCES += yoink.rc yoink.ico
+yoink_SOURCES += yoink.rc
 .rc.o:
-	$(AM_V_GEN) $(WINDRES) -o $@ -i $<
-endif
-
-yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
-yoink_LDADD = libmoof.a
-
-
+	$(WINDRES) -o $@ -i $<
+else
 YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
-
 run: all
 	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
-	$(YOINK_ENVIRONMENT) ddd ./yoink
+	$(YOINK_ENVIRONMENT) gdb ./yoink
+endif
+
+if LINK_SH
+yoink$(EXEEXT): $(yoink_OBJECTS) $(yoink_DEPENDENCIES)
+	@rm -f yoink$(EXEEXT)
+	@LINK="$(CXXLINK) $(yoink_OBJECTS) $(yoink_LDADD) $(LIBS)"\
+		sh $(top_srcdir)/link.sh
+
+clean-local:
+	rm -f .link/*
+endif