Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: make it compile

Browse source
This commit is contained in:
vl 2010-05-11 18:07:00 +02:00
parent 263405c224
commit c15622cb9b
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/stream_sound.h
View file

@ -60,7 +60,7 @@ public:
private: private:
CStreamSound(const CStreamSound &); CStreamSound(const CStreamSound &);
CStreamSound &operator=(const CStreamSound &); CStreamSound &operator=(const CStreamSound &);
private: private:
float m_Alpha; float m_Alpha;

8
code/nel/src/sound/Makefile.am
View file

@ -39,6 +39,8 @@ libnelsnd_la_SOURCES = async_file_manager_sound.cpp \
music_source.h \ music_source.h \
sample_bank.cpp \ sample_bank.cpp \
sample_bank.h \ sample_bank.h \
sample_bank_manager.cpp \
sample_bank_manager.h \
simple_sound.cpp \ simple_sound.cpp \
simple_sound.h \ simple_sound.h \
simple_source.cpp \ simple_source.cpp \
@ -54,7 +56,11 @@ libnelsnd_la_SOURCES = async_file_manager_sound.cpp \
source_common.cpp \ source_common.cpp \
source_common.h \ source_common.h \
stdsound.cpp \ stdsound.cpp \
stdsound.h stdsound.h \
stream_source.cpp \
stream_source.h \
stream_sound.cpp \
stream_sound.h
AM_CXXFLAGS = -I$(top_srcdir)/src AM_CXXFLAGS = -I$(top_srcdir)/src

5
code/ryzom/client/Makefile
View file

@ -1,9 +1,4 @@
night:
+make $(MAKE_NIGHT_ARGS) -k -C src night CXX=$(CXX)
$(BIN_DIR)/publish_nel
$(BIN_DIR)/publish_src
all: all:
+make $(MAKE_ALL_ARGS) -C src all +make $(MAKE_ALL_ARGS) -C src all

16
code/ryzom/client/src/Makefile
View file

@ -9,15 +9,15 @@ include ../../Variables.mk
WWWFLAGS = $(shell libwww-config --cflags) WWWFLAGS = $(shell libwww-config --cflags)
WWWLDFLAGS = $(shell libwww-config --libs) WWWLDFLAGS = $(shell libwww-config --libs)
LUAFLAGS = $(shell lua-config --include) LUAFLAGS = $(shell pkg-config lua5.1 --cflags)
LUALDFLAGS = $(shell lua-config --libs) LUALDFLAGS = $(shell pkg-config lua5.1 --libs)
# The flags for the C++ compiler # The flags for the C++ compiler
CXXFLAGS = $(WWWFLAGS) $(LUAFLAGS) \ CXXFLAGS = $(WWWFLAGS) $(LUAFLAGS) \
$(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-I/usr/include/libxml2 \ -I/usr/include/libxml2 \
-I$(RYZOM_PATH)/../../code/luabind \ -I$(RYZOM_PATH)/../../code/luabind \
-I$(NEL_PATH)/include \ -I$(NEL_INCLUDE) \
-I$(RYZOM_PATH)/common/src \ -I$(RYZOM_PATH)/common/src \
-I$(RYZOM_PATH)/client/src/seven_zip \ -I$(RYZOM_PATH)/client/src/seven_zip \
-I.. \ -I.. \
@ -28,8 +28,8 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
-L$(RYZOM_PATH)/common/src/game_share \ -L$(RYZOM_PATH)/common/src/game_share \
-L$(RYZOM_PATH)/client/src/client_sheets \ -L$(RYZOM_PATH)/client/src/client_sheets \
-L$(RYZOM_PATH)/client/src/seven_zip \ -L$(RYZOM_PATH)/client/src/seven_zip \
-lclient_sheets \ -lclient_sheets \
-lseven_zip \ -lseven_zip \
-lgame_share \ -lgame_share \
-lnel3d \ -lnel3d \
-lnelpacs \ -lnelpacs \
@ -38,12 +38,12 @@ LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
-lnelgeorges \ -lnelgeorges \
-lnelnet \ -lnelnet \
-lnelmisc \ -lnelmisc \
-lfreetype \
-lxml2 \ -lxml2 \
-ljpeg \ -ljpeg \
-lpng \ -lpng \
-lrt \ -lrt \
-ldl \ -ldl \
-llua50 \
-lluabind \ -lluabind \
-lcurl \ -lcurl \
-lX11 -lX11
@ -66,10 +66,10 @@ $(TARGETS): $(OBJS)
strip $(TARGETS) strip $(TARGETS)
client_sheets: client_sheets:
+make $(MAKE_ALL_ARGS) -C client_sheets all make $(MAKE_ALL_ARGS) -C client_sheets all
seven_zip: seven_zip:
+make $(MAKE_ALL_ARGS) -C seven_zip all make $(MAKE_ALL_ARGS) -C seven_zip all
############################################################################# #############################################################################
# Rules # Rules