[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src Makefile.am campaign_server/Makefil...
From: |
Yann Dirson |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src Makefile.am campaign_server/Makefil... |
Date: |
Sat, 22 Jan 2005 09:29:03 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 05/01/22 14:29:03
Modified files:
src : Makefile.am
src/campaign_server: Makefile.am
src/server : Makefile.am
src/tools : Makefile.am
Log message:
fixed build of everything with zipios support
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/campaign_server/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.67 wesnoth/src/Makefile.am:1.68
--- wesnoth/src/Makefile.am:1.67 Fri Jan 21 20:24:29 2005
+++ wesnoth/src/Makefile.am Sat Jan 22 14:29:02 2005
@@ -264,6 +264,7 @@
widgets/scrollbar.cpp \
widgets/slider.cpp \
widgets/widget.cpp \
+ zipios++/xcoll.cpp \
sdl_ttf/SDL_ttf.c \
editor/editor.hpp \
editor/editor_layout.hpp \
@@ -338,6 +339,7 @@
widgets/scrollbar.hpp \
widgets/slider.hpp \
widgets/widget.hpp \
+ zipios++/xcoll.hpp \
sdl_ttf/SDL_ttf.h \
wesconfig.h
Index: wesnoth/src/campaign_server/Makefile.am
diff -u wesnoth/src/campaign_server/Makefile.am:1.4
wesnoth/src/campaign_server/Makefile.am:1.5
--- wesnoth/src/campaign_server/Makefile.am:1.4 Tue Oct 12 22:38:20 2004
+++ wesnoth/src/campaign_server/Makefile.am Sat Jan 22 14:29:02 2005
@@ -15,6 +15,7 @@
../network_worker.cpp \
../publish_campaign.cpp \
../thread.cpp \
+ ../zipios++/xcoll.cpp \
../game_events.hpp \
../config.hpp \
../filesystem.hpp \
@@ -24,7 +25,8 @@
../network.hpp \
../network_worker.hpp \
../publish_campaign.hpp \
- ../thread.hpp
+ ../thread.hpp \
+ ../zipios++/xcoll.hpp
-AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\"
-AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@
+AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
+AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@ $(LIBZIPIOS)
Index: wesnoth/src/server/Makefile.am
diff -u wesnoth/src/server/Makefile.am:1.13 wesnoth/src/server/Makefile.am:1.14
--- wesnoth/src/server/Makefile.am:1.13 Mon Oct 11 23:46:43 2004
+++ wesnoth/src/server/Makefile.am Sat Jan 22 14:29:03 2005
@@ -18,6 +18,7 @@
../network.cpp \
../network_worker.cpp \
../thread.cpp \
+ ../zipios++/xcoll.cpp \
game.hpp \
../game_events.hpp \
input_stream.hpp \
@@ -30,7 +31,8 @@
../log.hpp \
../network.hpp \
../network_worker.hpp \
- ../thread.hpp
+ ../thread.hpp \
+ ../zipios++/xcoll.hpp
-AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\"
-AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@
+AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
+AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@ $(LIBZIPIOS)
Index: wesnoth/src/tools/Makefile.am
diff -u wesnoth/src/tools/Makefile.am:1.13 wesnoth/src/tools/Makefile.am:1.14
--- wesnoth/src/tools/Makefile.am:1.13 Sun Jan 2 21:12:43 2005
+++ wesnoth/src/tools/Makefile.am Sat Jan 22 14:29:03 2005
@@ -7,7 +7,7 @@
bin_PROGRAMS = exploder cutter
AM_CXXFLAGS = @SDL_CFLAGS@ @PNG_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -I../
\
- -DLOCALEDIR=\"$(LOCALEDIR)\"
+ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
AM_LDFLAGS = @SDL_LIBS@
@@ -22,12 +22,14 @@
../game_config.cpp \
../sdl_utils.cpp \
../log.cpp \
+ ../zipios++/xcoll.cpp \
exploder_composer.hpp \
exploder_cutter.hpp \
exploder_utils.hpp \
+ ../zipios++/xcoll.hpp \
../gettext.cpp
- cutter_SOURCES = cutter.cpp \
+cutter_SOURCES = cutter.cpp \
exploder_utils.cpp \
exploder_cutter.cpp \
../server/variable.cpp \
@@ -37,13 +39,15 @@
../game_config.cpp \
../sdl_utils.cpp \
../log.cpp \
+ ../zipios++/xcoll.cpp \
exploder_composer.hpp \
exploder_cutter.hpp \
exploder_utils.hpp \
+ ../zipios++/xcoll.hpp \
../gettext.cpp
-exploder_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @PNG_LIBS@
-cutter_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @PNG_LIBS@
+exploder_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @PNG_LIBS@ $(LIBZIPIOS)
+cutter_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @PNG_LIBS@ $(LIBZIPIOS)
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src Makefile.am campaign_server/Makefil...,
Yann Dirson <=