From c15622cb9baf905082e7ee4244b5e0428ad961a2 Mon Sep 17 00:00:00 2001 From: vl Date: Tue, 11 May 2010 18:07:00 +0200 Subject: [PATCH] Fixed: make it compile --- code/nel/include/nel/sound/stream_sound.h | 2 +- code/nel/src/sound/Makefile.am | 8 +++++++- code/ryzom/client/Makefile | 5 ----- code/ryzom/client/src/Makefile | 16 ++++++++-------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/nel/include/nel/sound/stream_sound.h b/code/nel/include/nel/sound/stream_sound.h index ec7606a7c..39e6c733c 100644 --- a/code/nel/include/nel/sound/stream_sound.h +++ b/code/nel/include/nel/sound/stream_sound.h @@ -60,7 +60,7 @@ public: private: CStreamSound(const CStreamSound &); CStreamSound &operator=(const CStreamSound &); - + private: float m_Alpha; diff --git a/code/nel/src/sound/Makefile.am b/code/nel/src/sound/Makefile.am index 1d319e928..b919e10c4 100644 --- a/code/nel/src/sound/Makefile.am +++ b/code/nel/src/sound/Makefile.am @@ -39,6 +39,8 @@ libnelsnd_la_SOURCES = async_file_manager_sound.cpp \ music_source.h \ sample_bank.cpp \ sample_bank.h \ + sample_bank_manager.cpp \ + sample_bank_manager.h \ simple_sound.cpp \ simple_sound.h \ simple_source.cpp \ @@ -54,7 +56,11 @@ libnelsnd_la_SOURCES = async_file_manager_sound.cpp \ source_common.cpp \ source_common.h \ stdsound.cpp \ - stdsound.h + stdsound.h \ + stream_source.cpp \ + stream_source.h \ + stream_sound.cpp \ + stream_sound.h AM_CXXFLAGS = -I$(top_srcdir)/src diff --git a/code/ryzom/client/Makefile b/code/ryzom/client/Makefile index 6c7ad97c3..11e58485a 100644 --- a/code/ryzom/client/Makefile +++ b/code/ryzom/client/Makefile @@ -1,9 +1,4 @@ -night: - +make $(MAKE_NIGHT_ARGS) -k -C src night CXX=$(CXX) - $(BIN_DIR)/publish_nel - $(BIN_DIR)/publish_src - all: +make $(MAKE_ALL_ARGS) -C src all diff --git a/code/ryzom/client/src/Makefile b/code/ryzom/client/src/Makefile index c05a48c63..5bd09fa01 100644 --- a/code/ryzom/client/src/Makefile +++ b/code/ryzom/client/src/Makefile @@ -9,15 +9,15 @@ include ../../Variables.mk WWWFLAGS = $(shell libwww-config --cflags) WWWLDFLAGS = $(shell libwww-config --libs) -LUAFLAGS = $(shell lua-config --include) -LUALDFLAGS = $(shell lua-config --libs) +LUAFLAGS = $(shell pkg-config lua5.1 --cflags) +LUALDFLAGS = $(shell pkg-config lua5.1 --libs) # The flags for the C++ compiler CXXFLAGS = $(WWWFLAGS) $(LUAFLAGS) \ $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ -I/usr/include/libxml2 \ -I$(RYZOM_PATH)/../../code/luabind \ - -I$(NEL_PATH)/include \ + -I$(NEL_INCLUDE) \ -I$(RYZOM_PATH)/common/src \ -I$(RYZOM_PATH)/client/src/seven_zip \ -I.. \ @@ -28,8 +28,8 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \ -L$(RYZOM_PATH)/common/src/game_share \ -L$(RYZOM_PATH)/client/src/client_sheets \ -L$(RYZOM_PATH)/client/src/seven_zip \ - -lclient_sheets \ - -lseven_zip \ + -lclient_sheets \ + -lseven_zip \ -lgame_share \ -lnel3d \ -lnelpacs \ @@ -38,12 +38,12 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \ -lnelgeorges \ -lnelnet \ -lnelmisc \ + -lfreetype \ -lxml2 \ -ljpeg \ -lpng \ -lrt \ -ldl \ - -llua50 \ -lluabind \ -lcurl \ -lX11 @@ -66,10 +66,10 @@ $(TARGETS): $(OBJS) strip $(TARGETS) client_sheets: - +make $(MAKE_ALL_ARGS) -C client_sheets all + make $(MAKE_ALL_ARGS) -C client_sheets all seven_zip: - +make $(MAKE_ALL_ARGS) -C seven_zip all + make $(MAKE_ALL_ARGS) -C seven_zip all ############################################################################# # Rules