X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=7a680c8d61c4e0bcfabac435c66fa37e3a16c55d;hb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c;hp=cecdac1c9b501fbd888e58a3baa57674f15dee6d;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f;p=chaz%2Fyoink diff --git a/src/Makefile.am b/src/Makefile.am index cecdac1..7a680c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,81 +5,343 @@ # +# +# libstlplus.a +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +noinst_LIBRARIES = libstlplus.a + +libstlplus_a_SOURCES = \ + stlplus/containers/containers.hpp \ + stlplus/containers/containers_fixes.hpp \ + stlplus/containers/copy_functors.hpp \ + stlplus/containers/digraph.hpp \ + stlplus/containers/digraph.tpp \ + stlplus/containers/exceptions.hpp \ + stlplus/containers/foursome.hpp \ + stlplus/containers/foursome.tpp \ + stlplus/containers/hash.hpp \ + stlplus/containers/hash.tpp \ + stlplus/containers/matrix.hpp \ + stlplus/containers/matrix.tpp \ + stlplus/containers/ntree.hpp \ + stlplus/containers/ntree.tpp \ + stlplus/containers/safe_iterator.hpp \ + stlplus/containers/safe_iterator.tpp \ + stlplus/containers/simple_ptr.hpp \ + stlplus/containers/simple_ptr.tpp \ + stlplus/containers/smart_ptr.hpp \ + stlplus/containers/smart_ptr.tpp \ + stlplus/containers/triple.hpp \ + stlplus/containers/triple.tpp \ + stlplus/persistence/persistence.hpp \ + stlplus/persistence/persistence_fixes.hpp \ + stlplus/persistence/persistent.hpp \ + stlplus/persistence/persistent_basic.hpp \ + stlplus/persistence/persistent_bitset.hpp \ + stlplus/persistence/persistent_bitset.tpp \ + stlplus/persistence/persistent_bool.cpp \ + stlplus/persistence/persistent_bool.hpp \ + stlplus/persistence/persistent_callback.hpp \ + stlplus/persistence/persistent_callback.tpp \ + stlplus/persistence/persistent_complex.hpp \ + stlplus/persistence/persistent_complex.tpp \ + stlplus/persistence/persistent_contexts.cpp \ + stlplus/persistence/persistent_contexts.hpp \ + stlplus/persistence/persistent_cstring.cpp \ + stlplus/persistence/persistent_cstring.hpp \ + stlplus/persistence/persistent_deque.hpp \ + stlplus/persistence/persistent_deque.tpp \ + stlplus/persistence/persistent_digraph.hpp \ + stlplus/persistence/persistent_digraph.tpp \ + stlplus/persistence/persistent_enum.hpp \ + stlplus/persistence/persistent_enum.tpp \ + stlplus/persistence/persistent_exceptions.cpp \ + stlplus/persistence/persistent_exceptions.hpp \ + stlplus/persistence/persistent_float.cpp \ + stlplus/persistence/persistent_float.hpp \ + stlplus/persistence/persistent_foursome.hpp \ + stlplus/persistence/persistent_foursome.tpp \ + stlplus/persistence/persistent_hash.hpp \ + stlplus/persistence/persistent_hash.tpp \ + stlplus/persistence/persistent_inf.cpp \ + stlplus/persistence/persistent_inf.hpp \ + stlplus/persistence/persistent_int.cpp \ + stlplus/persistence/persistent_int.hpp \ + stlplus/persistence/persistent_interface.hpp \ + stlplus/persistence/persistent_interface.tpp \ + stlplus/persistence/persistent_list.hpp \ + stlplus/persistence/persistent_list.tpp \ + stlplus/persistence/persistent_map.hpp \ + stlplus/persistence/persistent_map.tpp \ + stlplus/persistence/persistent_matrix.hpp \ + stlplus/persistence/persistent_matrix.tpp \ + stlplus/persistence/persistent_multimap.hpp \ + stlplus/persistence/persistent_multimap.tpp \ + stlplus/persistence/persistent_multiset.hpp \ + stlplus/persistence/persistent_multiset.tpp \ + stlplus/persistence/persistent_ntree.hpp \ + stlplus/persistence/persistent_ntree.tpp \ + stlplus/persistence/persistent_pair.hpp \ + stlplus/persistence/persistent_pair.tpp \ + stlplus/persistence/persistent_pointer.hpp \ + stlplus/persistence/persistent_pointer.tpp \ + stlplus/persistence/persistent_pointers.hpp \ + stlplus/persistence/persistent_set.hpp \ + stlplus/persistence/persistent_set.tpp \ + stlplus/persistence/persistent_shortcuts.hpp \ + stlplus/persistence/persistent_shortcuts.tpp \ + stlplus/persistence/persistent_simple_ptr.hpp \ + stlplus/persistence/persistent_simple_ptr.tpp \ + stlplus/persistence/persistent_smart_ptr.hpp \ + stlplus/persistence/persistent_smart_ptr.tpp \ + stlplus/persistence/persistent_stl.hpp \ + stlplus/persistence/persistent_stlplus.hpp \ + stlplus/persistence/persistent_string.cpp \ + stlplus/persistence/persistent_string.hpp \ + stlplus/persistence/persistent_string.tpp \ + stlplus/persistence/persistent_triple.hpp \ + stlplus/persistence/persistent_triple.tpp \ + stlplus/persistence/persistent_vector.cpp \ + stlplus/persistence/persistent_vector.hpp \ + stlplus/persistence/persistent_vector.tpp \ + stlplus/persistence/persistent_xref.hpp \ + stlplus/persistence/persistent_xref.tpp \ + stlplus/portability/build.cpp \ + stlplus/portability/build.hpp \ + stlplus/portability/debug.cpp \ + stlplus/portability/debug.hpp \ + stlplus/portability/dprintf.cpp \ + stlplus/portability/dprintf.hpp \ + stlplus/portability/dynaload.cpp \ + stlplus/portability/dynaload.hpp \ + stlplus/portability/file_system.cpp \ + stlplus/portability/file_system.hpp \ + stlplus/portability/inf.cpp \ + stlplus/portability/inf.hpp \ + stlplus/portability/ip_sockets.cpp \ + stlplus/portability/ip_sockets.hpp \ + stlplus/portability/portability.hpp \ + stlplus/portability/portability_exceptions.hpp \ + stlplus/portability/portability_fixes.cpp \ + stlplus/portability/portability_fixes.hpp \ + stlplus/portability/subprocesses.cpp \ + stlplus/portability/subprocesses.hpp \ + stlplus/portability/tcp.hpp \ + stlplus/portability/tcp_sockets.cpp \ + stlplus/portability/tcp_sockets.hpp \ + stlplus/portability/time.cpp \ + stlplus/portability/time.hpp \ + stlplus/portability/udp_sockets.cpp \ + stlplus/portability/udp_sockets.hpp \ + stlplus/portability/version.cpp \ + stlplus/portability/version.hpp \ + stlplus/portability/wildcard.cpp \ + stlplus/portability/wildcard.hpp \ + stlplus/strings/format_types.hpp \ + stlplus/strings/print_address.cpp \ + stlplus/strings/print_address.hpp \ + stlplus/strings/print_basic.hpp \ + stlplus/strings/print_bitset.hpp \ + stlplus/strings/print_bitset.tpp \ + stlplus/strings/print_bool.cpp \ + stlplus/strings/print_bool.hpp \ + stlplus/strings/print_cstring.cpp \ + stlplus/strings/print_cstring.hpp \ + stlplus/strings/print_digraph.hpp \ + stlplus/strings/print_digraph.tpp \ + stlplus/strings/print_float.cpp \ + stlplus/strings/print_float.hpp \ + stlplus/strings/print_foursome.hpp \ + stlplus/strings/print_foursome.tpp \ + stlplus/strings/print_hash.hpp \ + stlplus/strings/print_hash.tpp \ + stlplus/strings/print_inf.cpp \ + stlplus/strings/print_inf.hpp \ + stlplus/strings/print_int.cpp \ + stlplus/strings/print_int.hpp \ + stlplus/strings/print_list.hpp \ + stlplus/strings/print_list.tpp \ + stlplus/strings/print_map.hpp \ + stlplus/strings/print_map.tpp \ + stlplus/strings/print_matrix.hpp \ + stlplus/strings/print_matrix.tpp \ + stlplus/strings/print_ntree.hpp \ + stlplus/strings/print_ntree.tpp \ + stlplus/strings/print_pair.hpp \ + stlplus/strings/print_pair.tpp \ + stlplus/strings/print_pointer.hpp \ + stlplus/strings/print_pointer.tpp \ + stlplus/strings/print_sequence.hpp \ + stlplus/strings/print_sequence.tpp \ + stlplus/strings/print_set.hpp \ + stlplus/strings/print_set.tpp \ + stlplus/strings/print_simple_ptr.hpp \ + stlplus/strings/print_simple_ptr.tpp \ + stlplus/strings/print_smart_ptr.hpp \ + stlplus/strings/print_smart_ptr.tpp \ + stlplus/strings/print_stl.hpp \ + stlplus/strings/print_stlplus.hpp \ + stlplus/strings/print_string.cpp \ + stlplus/strings/print_string.hpp \ + stlplus/strings/print_triple.hpp \ + stlplus/strings/print_triple.tpp \ + stlplus/strings/print_vector.cpp \ + stlplus/strings/print_vector.hpp \ + stlplus/strings/print_vector.tpp \ + stlplus/strings/string_address.cpp \ + stlplus/strings/string_address.hpp \ + stlplus/strings/string_basic.hpp \ + stlplus/strings/string_bitset.hpp \ + stlplus/strings/string_bitset.tpp \ + stlplus/strings/string_bool.cpp \ + stlplus/strings/string_bool.hpp \ + stlplus/strings/string_cstring.cpp \ + stlplus/strings/string_cstring.hpp \ + stlplus/strings/string_digraph.hpp \ + stlplus/strings/string_digraph.tpp \ + stlplus/strings/string_float.cpp \ + stlplus/strings/string_float.hpp \ + stlplus/strings/string_foursome.hpp \ + stlplus/strings/string_foursome.tpp \ + stlplus/strings/string_hash.hpp \ + stlplus/strings/string_hash.tpp \ + stlplus/strings/string_inf.cpp \ + stlplus/strings/string_inf.hpp \ + stlplus/strings/string_int.cpp \ + stlplus/strings/string_int.hpp \ + stlplus/strings/string_list.hpp \ + stlplus/strings/string_list.tpp \ + stlplus/strings/string_map.hpp \ + stlplus/strings/string_map.tpp \ + stlplus/strings/string_matrix.hpp \ + stlplus/strings/string_matrix.tpp \ + stlplus/strings/string_ntree.hpp \ + stlplus/strings/string_ntree.tpp \ + stlplus/strings/string_pair.hpp \ + stlplus/strings/string_pair.tpp \ + stlplus/strings/string_pointer.hpp \ + stlplus/strings/string_pointer.tpp \ + stlplus/strings/string_sequence.hpp \ + stlplus/strings/string_sequence.tpp \ + stlplus/strings/string_set.hpp \ + stlplus/strings/string_set.tpp \ + stlplus/strings/string_simple_ptr.hpp \ + stlplus/strings/string_simple_ptr.tpp \ + stlplus/strings/string_smart_ptr.hpp \ + stlplus/strings/string_smart_ptr.tpp \ + stlplus/strings/string_stl.hpp \ + stlplus/strings/string_stlplus.hpp \ + stlplus/strings/string_string.cpp \ + stlplus/strings/string_string.hpp \ + stlplus/strings/string_triple.hpp \ + stlplus/strings/string_triple.tpp \ + stlplus/strings/string_utilities.cpp \ + stlplus/strings/string_utilities.hpp \ + stlplus/strings/string_vector.cpp \ + stlplus/strings/string_vector.hpp \ + stlplus/strings/string_vector.tpp \ + stlplus/strings/strings.hpp \ + stlplus/strings/strings_fixes.hpp \ + stlplus/subsystems/cli_parser.cpp \ + stlplus/subsystems/cli_parser.hpp \ + stlplus/subsystems/ini_manager.cpp \ + stlplus/subsystems/ini_manager.hpp \ + stlplus/subsystems/library_manager.cpp \ + stlplus/subsystems/library_manager.hpp \ + stlplus/subsystems/message_handler.cpp \ + stlplus/subsystems/message_handler.hpp \ + stlplus/subsystems/subsystems.hpp \ + stlplus/subsystems/subsystems_fixes.hpp \ + stlplus/subsystems/timer.cpp \ + stlplus/subsystems/timer.hpp \ + $(ENDLIST) + + # # libmoof.a -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ noinst_LIBRARIES = libmoof.a +#libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/moof + libmoof_a_SOURCES = \ - Moof/Aabb.cc \ - Moof/Aabb.hh \ - Moof/Camera.cc \ - Moof/Camera.hh \ - Moof/ConvertUTF.c \ - Moof/ConvertUTF.h \ - Moof/Cullable.hh \ - Moof/Dispatcher.cc \ - Moof/Dispatcher.hh \ - Moof/Drawable.hh \ - Moof/Engine.cc \ - Moof/Engine.hh \ - Moof/Entity.hh \ - Moof/Event.hh \ - Moof/Exception.hh \ - Moof/Frustum.cc \ - Moof/Frustum.hh \ - Moof/Hash.cc \ - Moof/Hash.hh \ - Moof/Interpolator.hh \ - Moof/Layer.hh \ - Moof/Log.cc \ - Moof/Log.hh \ - Moof/Math.hh \ - Moof/Mippleton.hh \ - Moof/Octree.hh \ - Moof/OpenGL.hh \ - Moof/Plane.cc \ - Moof/Plane.hh \ - Moof/Random.cc \ - Moof/Random.hh \ - Moof/Rectangle.cc \ - Moof/Rectangle.hh \ - Moof/Resource.cc \ - Moof/Resource.hh \ - Moof/RigidBody.hh \ - Moof/Script.hh \ - Moof/Settings.cc \ - Moof/Settings.hh \ - Moof/Sound.cc \ - Moof/Sound.hh \ - Moof/Sphere.cc \ - Moof/Sphere.hh \ - Moof/StringTools.cc \ - Moof/StringTools.hh \ - Moof/Texture.cc \ - Moof/Texture.hh \ - Moof/Thread.hh \ - Moof/Timer.cc \ - Moof/Timer.hh \ - Moof/Transition.hh \ - Moof/Video.cc \ - Moof/Video.hh \ - Moof/fastevents.c \ - Moof/fastevents.h \ + moof/aabb.cc \ + moof/aabb.hh \ + moof/backend.cc \ + moof/backend.hh \ + moof/camera.cc \ + moof/camera.hh \ + moof/contact.hh \ + moof/ConvertUTF.c \ + moof/ConvertUTF.h \ + moof/cullable.hh \ + moof/dispatcher.cc \ + moof/dispatcher.hh \ + moof/drawable.hh \ + moof/entity.hh \ + moof/event.hh \ + moof/frustum.cc \ + moof/frustum.hh \ + moof/hash.cc \ + moof/hash.hh \ + moof/image.cc \ + moof/image.hh \ + moof/interpolator.hh \ + moof/line.hh \ + moof/log.cc \ + moof/log.hh \ + moof/manager.hh \ + moof/math.hh \ + moof/modal_dialog.hh \ + moof/network.hh \ + moof/opengl.hh \ + moof/packet.cc \ + moof/packet.hh \ + moof/plane.cc \ + moof/plane.hh \ + moof/ray.hh \ + moof/resource.cc \ + moof/resource.hh \ + moof/rigid_body.hh \ + moof/script.hh \ + moof/service.cc \ + moof/service.hh \ + moof/settings.cc \ + moof/settings.hh \ + moof/shape.hh \ + moof/socket.hh \ + moof/sound.cc \ + moof/sound.hh \ + moof/sphere.hh \ + moof/string.cc \ + moof/string.hh \ + moof/texture.cc \ + moof/texture.hh \ + moof/thread.hh \ + moof/timer.cc \ + moof/timer.hh \ + moof/video.cc \ + moof/video.hh \ + moof/view.cc \ + moof/view.hh \ + moof/fastevents.c \ + moof/fastevents.h \ $(ENDLIST) -libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof - -EXTRA_DIST = Moof/cml Moof/stlplus +EXTRA_DIST = cml # # yoink -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bin_PROGRAMS = yoink +#yoink_CPPFLAGS = -I$(top_srcdir)/src/moof +yoink_LDADD = libstlplus.a libmoof.a + yoink_SOURCES = \ Animation.cc \ Animation.hh \ @@ -87,40 +349,45 @@ yoink_SOURCES = \ Character.hh \ GameLayer.cc \ GameLayer.hh \ + GameState.hh \ Heroine.cc \ Heroine.hh \ Hud.cc \ Hud.hh \ - MainLayer.cc \ - MainLayer.hh \ + Main.cc \ + Main.hh \ Scene.cc \ Scene.hh \ - Tilemap.cc \ - Tilemap.hh \ TilemapFont.cc \ TilemapFont.hh \ TitleLayer.cc \ TitleLayer.hh \ Typesetter.cc \ Typesetter.hh \ + version.c \ version.h \ $(ENDLIST) if WIN32 -yoink_SOURCES += yoink.rc yoink.ico +yoink_SOURCES += yoink.rc .rc.o: - @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) 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