diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..b0cc9b9 --- /dev/null +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 56a7d6e..a3287a7 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,8 @@ AC_CHECK_FUNCS([floor ftime ftruncate getcwd gethostbyaddr gethostbyname gethost # src/dep/src/zthread/Makefile]) #AC_CONFIG_SUBDIRS([src/dep/src/irrlicht/jpeglib # src/dep/src/irrlicht/libpng]) -AC_CONFIG_FILES([src/Makefile +AC_CONFIG_FILES([Makefile + src/Makefile src/shared/Makefile src/shared/Auth/Makefile src/shared/Network/Makefile diff --git a/src/Client/DefScript/Makefile.am b/src/Client/DefScript/Makefile.am index 2ca4a69..ab0b85e 100644 --- a/src/Client/DefScript/Makefile.am +++ b/src/Client/DefScript/Makefile.am @@ -1,5 +1,5 @@ ## 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 noinst_LIBRARIES = libdefscript.a libdefscript_a_SOURCES =DefScriptBBFunctions.cpp\ @@ -11,7 +11,7 @@ libdefscript_a_SOURCES =DefScriptBBFunctions.cpp\ DefScriptTools.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 diff --git a/src/Client/GUI/Makefile.am b/src/Client/GUI/Makefile.am index 5a15828..9d19410 100644 --- a/src/Client/GUI/Makefile.am +++ b/src/Client/GUI/Makefile.am @@ -1,5 +1,5 @@ ## 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 noinst_LIBRARIES = libgui.a 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.h DrawObjMgr.h Scene.cpp ShTlTerrainSceneNode.cpp\ 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 diff --git a/src/Client/Makefile.am b/src/Client/Makefile.am index 3d15cf7..aa3e976 100644 --- a/src/Client/Makefile.am +++ b/src/Client/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in 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 bin_PROGRAMS = pseuwow pseuwow_SOURCES = Cli.cpp\ @@ -18,5 +18,5 @@ pseuwow_SOURCES = Cli.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_LDFLAGS =-pthread \ No newline at end of file +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 \ No newline at end of file diff --git a/src/Client/Realm/Makefile.am b/src/Client/Realm/Makefile.am index ad2495f..3c68f12 100644 --- a/src/Client/Realm/Makefile.am +++ b/src/Client/Realm/Makefile.am @@ -1,8 +1,8 @@ ## 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 noinst_LIBRARIES = librealm.a 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 diff --git a/src/Client/World/Makefile.am b/src/Client/World/Makefile.am index 7afaa76..3e2d7e9 100644 --- a/src/Client/World/Makefile.am +++ b/src/Client/World/Makefile.am @@ -1,5 +1,5 @@ ## 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 noinst_LIBRARIES = libworld.a libworld_a_SOURCES =Bag.cpp DynamicObject.cpp MovementMgr.cpp Player.cpp World.cpp\ diff --git a/src/Makefile.am b/src/Makefile.am index e64eb53..b47427f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ ## 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 ## End Makefile.am diff --git a/src/dep/lib/linux-gcc/ikpMP3.so b/src/dep/lib/linux-gcc/ikpMP3.so new file mode 100644 index 0000000..fc3804c Binary files /dev/null and b/src/dep/lib/linux-gcc/ikpMP3.so differ diff --git a/src/dep/lib/linux-gcc/libIrrKlang.so b/src/dep/lib/linux-gcc/libIrrKlang.so new file mode 100644 index 0000000..2169726 Binary files /dev/null and b/src/dep/lib/linux-gcc/libIrrKlang.so differ diff --git a/src/shared/Auth/Makefile.am b/src/shared/Auth/Makefile.am index b34524a..0742f6d 100644 --- a/src/shared/Auth/Makefile.am +++ b/src/shared/Auth/Makefile.am @@ -1,5 +1,5 @@ ## 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 noinst_LIBRARIES = libauth.a libauth_a_SOURCES = AuthCrypt.cpp BigNumber.cpp md5.c Sha1.cpp Hmac.cpp diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index 141f59f..d535ee4 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in 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 noinst_LIBRARIES = libshared.a libshared_a_SOURCES = ADTFile.cpp common.h log.h MapTile.h tools.cpp Widen.h\ diff --git a/src/shared/Network/Makefile.am b/src/shared/Network/Makefile.am index ca59a8e..0ffb4cf 100644 --- a/src/shared/Network/Makefile.am +++ b/src/shared/Network/Makefile.am @@ -1,5 +1,5 @@ ## 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 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