[svn] Fix build in Linux. Patch provided by SyRiOCoP.
--HG-- branch : trunk
This commit is contained in:
+9
-10
@@ -9,12 +9,12 @@
|
|||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
@@ -31,6 +31,7 @@ noinst_LIBRARIES = libshared.a
|
|||||||
libshared_a_CPPFLAGS = \
|
libshared_a_CPPFLAGS = \
|
||||||
$(MYSQL_INCLUDES) \
|
$(MYSQL_INCLUDES) \
|
||||||
$(POSTGRE_INCLUDES) \
|
$(POSTGRE_INCLUDES) \
|
||||||
|
$(TRINI_INCLUDES) \
|
||||||
-I$(top_srcdir)/dep/include \
|
-I$(top_srcdir)/dep/include \
|
||||||
-I$(top_srcdir)/src/framework
|
-I$(top_srcdir)/src/framework
|
||||||
|
|
||||||
@@ -108,14 +109,12 @@ $(srcdir)/Database/dbcfile.h
|
|||||||
## Additional files to include when running 'make dist'
|
## Additional files to include when running 'make dist'
|
||||||
# Disabled packet logger
|
# Disabled packet logger
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
PacketLog.cpp \
|
PacketLog.cpp \
|
||||||
PacketLog.h
|
PacketLog.h
|
||||||
|
|
||||||
# System Win32 files
|
# System Win32 files
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
ServiceWin32.cpp \
|
ServiceWin32.cpp \
|
||||||
ServiceWin32.h \
|
ServiceWin32.h \
|
||||||
WheatyExceptionReport.cpp \
|
WheatyExceptionReport.cpp \
|
||||||
WheatyExceptionReport.h
|
WheatyExceptionReport.h
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +1,36 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
|
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
|
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// THIS FILE IS DEPRECATED
|
// THIS FILE IS DEPRECATED
|
||||||
|
|
||||||
#ifndef TRINITY_SYSTEMCONFIG_H
|
#ifndef TRINITY_SYSTEMCONFIG_H
|
||||||
#define TRINITY_SYSTEMCONFIG_H
|
#define TRINITY_SYSTEMCONFIG_H
|
||||||
|
|
||||||
#include "Platform/Define.h"
|
#include "Platform/Define.h"
|
||||||
|
|
||||||
// THIS IS TEMP :)
|
// THIS IS TEMP :)
|
||||||
#define _FULLVERSION "Trinity"
|
#define _FULLVERSION "Trinity"
|
||||||
|
|
||||||
#define DEFAULT_PLAYER_LIMIT 100
|
#define DEFAULT_PLAYER_LIMIT 100
|
||||||
#define DEFAULT_WORLDSERVER_PORT 8085 //8129
|
#define DEFAULT_WORLDSERVER_PORT 8085 //8129
|
||||||
#define DEFAULT_REALMSERVER_PORT 3724
|
#define DEFAULT_REALMSERVER_PORT 3724
|
||||||
#define DEFAULT_SOCKET_SELECT_TIME 10000
|
#define DEFAULT_SOCKET_SELECT_TIME 10000
|
||||||
#endif
|
#endif
|
||||||
Reference in New Issue
Block a user