diff options
Diffstat (limited to 'dep/src')
| -rw-r--r-- | dep/src/Makefile.am | 25 | ||||
| -rw-r--r-- | dep/src/sockets/Makefile.am | 49 | ||||
| -rw-r--r-- | dep/src/zthread/AtomicCount.cxx | 57 |
3 files changed, 74 insertions, 57 deletions
diff --git a/dep/src/Makefile.am b/dep/src/Makefile.am new file mode 100644 index 00000000000..50814f8ff13 --- /dev/null +++ b/dep/src/Makefile.am @@ -0,0 +1,25 @@ +# Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> +# +# Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +## Process this file with automake to produce Makefile.in + +## Sub-directories to parse +SUBDIRS = g3dlite sockets zlib + +## Additional files to include when running 'make dist' +# Nothing yet. diff --git a/dep/src/sockets/Makefile.am b/dep/src/sockets/Makefile.am new file mode 100644 index 00000000000..5cd6eaf4307 --- /dev/null +++ b/dep/src/sockets/Makefile.am @@ -0,0 +1,49 @@ +# Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> +# +# Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +## Process this file with automake to produce Makefile.in + +## Sub-directories to parse + +## CPP flags for includes, defines, etc. +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../../include/sockets + +## Build MaNGOS shared library and its parts as convenience library. +# All libraries will be convenience libraries. Might be changed to shared +# later. +noinst_LIBRARIES = libmangossockets.a + +libmangossockets_a_SOURCES = \ + Base64.cpp \ + Exception.cpp \ + Ipv4Address.cpp \ + Ipv6Address.cpp \ + Lock.cpp \ + Mutex.cpp \ + Parse.cpp \ + ResolvServer.cpp \ + ResolvSocket.cpp \ + Socket.cpp \ + SocketHandler.cpp \ + StdoutLog.cpp \ + StreamSocket.cpp \ + TcpSocket.cpp \ + Thread.cpp \ + UdpSocket.cpp \ + Utility.cpp \ + socket_include.cpp diff --git a/dep/src/zthread/AtomicCount.cxx b/dep/src/zthread/AtomicCount.cxx deleted file mode 100644 index ac0d0773b12..00000000000 --- a/dep/src/zthread/AtomicCount.cxx +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2005, Eric Crahen - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished - * to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifndef __ZTATOMICCOUNTSELECT_H__ -#define __ZTATOMICCOUNTSELECT_H__ - -#include "zthread/AtomicCount.h" -#include "zthread/Config.h" - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -/* -// Select the correct AtomicCount implementation based on -// what the compilation environment has defined - -#ifndef ZT_VANILLA - -#if defined(HAVE_ATOMIC_LINUX) -# include "linux/AtomicCount.cxx" -#elif defined(ZT_WIN32) -# include "win32/AtomicCount.cxx" -#elif defined(ZT_WIN9X) -# include "win9x/AtomicCount.cxx" -#endif - -#endif - -// Default to an AtomicCount that just uses a FastLock -#ifndef __ZTATOMICCOUNTIMPL_H__ -# include "vanilla/SimpleAtomicCount.cxx" -#endif -*/ - -# include "vanilla/SimpleAtomicCount.cxx" - -#endif // __ZTATOMICCOUNTSELECT_H__ |