* Fixed Makefiles to reflect changes since the last time they were updated

* added linux libs for Irrklang to /dep/lib
This commit is contained in:
shlainn 2008-10-12 10:08:49 +00:00
parent 8af84b8c87
commit ba6b918a69
13 changed files with 26 additions and 16 deletions

4
Makefile.am Normal file
View File

@ -0,0 +1,4 @@
## Makefile.am - process this file with automake
AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
SUBDIRS = src
## End Makefile.am

View File

@ -63,7 +63,8 @@ AC_CHECK_FUNCS([floor ftime ftruncate getcwd gethostbyaddr gethostbyname gethost
# src/dep/src/zthread/Makefile]) # src/dep/src/zthread/Makefile])
#AC_CONFIG_SUBDIRS([src/dep/src/irrlicht/jpeglib #AC_CONFIG_SUBDIRS([src/dep/src/irrlicht/jpeglib
# src/dep/src/irrlicht/libpng]) # src/dep/src/irrlicht/libpng])
AC_CONFIG_FILES([src/Makefile AC_CONFIG_FILES([Makefile
src/Makefile
src/shared/Makefile src/shared/Makefile
src/shared/Auth/Makefile src/shared/Auth/Makefile
src/shared/Network/Makefile src/shared/Network/Makefile

View File

@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = libdefscript.a noinst_LIBRARIES = libdefscript.a
libdefscript_a_SOURCES =DefScriptBBFunctions.cpp\ libdefscript_a_SOURCES =DefScriptBBFunctions.cpp\
@ -11,7 +11,7 @@ libdefscript_a_SOURCES =DefScriptBBFunctions.cpp\
DefScriptTools.cpp\ DefScriptTools.cpp\
VarSet.cpp VarSet.cpp
libdefscript_a_LIBADD = $(top_builddir)/shared/libshared.a $(top_builddir)/shared/Auth/libauth.a $(top_builddir)/shared/Network/libnetwork.a libdefscript_a_LIBADD = $(top_builddir)/src/shared/libshared.a $(top_builddir)/src/shared/Auth/libauth.a $(top_builddir)/src/shared/Network/libnetwork.a

View File

@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = libgui.a noinst_LIBRARIES = libgui.a
libgui_a_SOURCES =CCursorController.cpp DrawObject.cpp MInput.h Scene.h SImage.h\ libgui_a_SOURCES =CCursorController.cpp DrawObject.cpp MInput.h Scene.h SImage.h\
@ -7,9 +7,14 @@ CCursorController.h DrawObject.h PseuGUI.cpp SceneLogin.cpp
CImageLoaderBLP.cpp DrawObjMgr.cpp PseuGUI.h SceneWorld.cpp TlTSector.h\ CImageLoaderBLP.cpp DrawObjMgr.cpp PseuGUI.h SceneWorld.cpp TlTSector.h\
CImageLoaderBLP.h DrawObjMgr.h Scene.cpp ShTlTerrainSceneNode.cpp\ CImageLoaderBLP.h DrawObjMgr.h Scene.cpp ShTlTerrainSceneNode.cpp\
CM2MeshFileLoader.cpp SceneData.h ShTlTerrainSceneNode.h\ CM2MeshFileLoader.cpp SceneData.h ShTlTerrainSceneNode.h\
CM2MeshFileLoader.h MCamera.h SceneGuiStart.cpp SImage.cpp CM2MeshFileLoader.h MCamera.h SceneGuiStart.cpp SImage.cpp SceneCharselection.cpp\
CIrrKlangAudioStreamLoaderMP3.cpp CIrrKlangAudioStreamLoaderMP3.h CIrrKlangAudioStreamMP3.cpp CIrrKlangAudioStreamMP3.h\
ikpMP3.cpp decoder/bits.c decoder/internal.h decoder/mpaudec.c decoder/mpaudec.h decoder/mpaudectab.h decoder/mpegaudio.h\
irrKlangSceneNode.cpp irrKlangSceneNode.h
libgui_a_LIBADD = $(top_builddir)/src/shared/libshared.a $(top_builddir)/src/shared/Auth/libauth.a $(top_builddir)/src/shared/Network/libnetwork.a
libgui_a_LIBADD = $(top_builddir)/shared/libshared.a $(top_builddir)/shared/Auth/libauth.a $(top_builddir)/shared/Network/libnetwork.a

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = DefScript Realm World GUI SUBDIRS = DefScript Realm World GUI
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
bin_PROGRAMS = pseuwow bin_PROGRAMS = pseuwow
pseuwow_SOURCES = Cli.cpp\ pseuwow_SOURCES = Cli.cpp\
@ -18,5 +18,5 @@ pseuwow_SOURCES = Cli.cpp\
World/MapMgr.cpp World/MapMgr.cpp
pseuwow_LDADD = ../shared/libshared.a ../shared/Auth/libauth.a ../shared/Network/libnetwork.a DefScript/libdefscript.a World/libworld.a GUI/libgui.a pseuwow_LDADD = ../shared/libshared.a ../shared/Auth/libauth.a ../shared/Network/libnetwork.a DefScript/libdefscript.a World/libworld.a GUI/libgui.a /usr/local/lib/libIrrKlang.so
pseuwow_LDFLAGS =-pthread pseuwow_LDFLAGS =-pthread

View File

@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = librealm.a noinst_LIBRARIES = librealm.a
librealm_a_SOURCES =RealmSession.cpp RealmSession.h RealmSocket.cpp RealmSocket.h librealm_a_SOURCES =RealmSession.cpp RealmSession.h RealmSocket.cpp RealmSocket.h
librealm_a_LIBADD = $(top_builddir)/shared/libshared.a $(top_builddir)/shared/Auth/libauth.a $(top_builddir)/shared/Network/libnetwork.a librealm_a_LIBADD = $(top_builddir)/src/shared/libshared.a $(top_builddir)/src/shared/Auth/libauth.a $(top_builddir)/src/shared/Network/libnetwork.a

View File

@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = libworld.a noinst_LIBRARIES = libworld.a
libworld_a_SOURCES =Bag.cpp DynamicObject.cpp MovementMgr.cpp Player.cpp World.cpp\ libworld_a_SOURCES =Bag.cpp DynamicObject.cpp MovementMgr.cpp Player.cpp World.cpp\

View File

@ -1,4 +1,4 @@
## Makefile.am - process this file with automake ## Makefile.am - process this file with automake
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
SUBDIRS = shared Client SUBDIRS = shared Client
## End Makefile.am ## End Makefile.am

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = libauth.a noinst_LIBRARIES = libauth.a
libauth_a_SOURCES = AuthCrypt.cpp BigNumber.cpp md5.c Sha1.cpp Hmac.cpp libauth_a_SOURCES = AuthCrypt.cpp BigNumber.cpp md5.c Sha1.cpp Hmac.cpp

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = Auth Network SUBDIRS = Auth Network
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = libshared.a noinst_LIBRARIES = libshared.a
libshared_a_SOURCES = ADTFile.cpp common.h log.h MapTile.h tools.cpp Widen.h\ libshared_a_SOURCES = ADTFile.cpp common.h log.h MapTile.h tools.cpp Widen.h\

View File

@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = -I$(top_builddir)/Client -I$(top_builddir)/shared -I$(top_builddir)/Client/DefScript -I$(top_builddir)/Client/World -I$(top_builddir)/Client/Realm -Wall AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -Wall
## Build pseuwow ## Build pseuwow
noinst_LIBRARIES = libnetwork.a noinst_LIBRARIES = libnetwork.a
libnetwork_a_SOURCES =Base64.cpp PoolSocket.cpp Socket.cpp SocketThread.cpp Thread.cpp CircularBuffer.cpp ResolvServer.cpp SocketHandler.cpp StdoutLog.cpp UdpSocket.cpp Parse.cpp ResolvSocket.cpp socket_include.cpp TcpSocket.cpp Utility.cpp libnetwork_a_SOURCES =Base64.cpp PoolSocket.cpp Socket.cpp SocketThread.cpp Thread.cpp CircularBuffer.cpp ResolvServer.cpp SocketHandler.cpp StdoutLog.cpp UdpSocket.cpp Parse.cpp ResolvSocket.cpp socket_include.cpp TcpSocket.cpp Utility.cpp