Fix build in Linux.

user: Elminster

--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-30 18:00:32 -06:00
parent 32f571506b
commit e1e4c40b4a
3 changed files with 36 additions and 4 deletions

View File

@@ -22,7 +22,7 @@
SUBDIRS = Auth Config Database vmap
## CPP flags for includes, defines, etc.
AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\"$(sysconfdir)/\"
AM_CPPFLAGS = $(TRINI_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\"$(sysconfdir)/\"
## AM_CPPFLAGS += -I$(srcdir)/../game -I$(srcdir)/../realmd
## Build MaNGOS shared library and its parts as convenience library.

View File

@@ -0,0 +1,32 @@
/*
* Copyright (C) 2005-2008 MaNGOS <http://getmangos.com/>
*
* 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
*/
#include "MemoryLeaks.h"
#include "Policies/SingletonImp.h"
INSTANTIATE_SINGLETON_1( MemoryManager ) ;
MemoryManager::MemoryManager( )
{
#if COMPILER == MICROSOFT
// standard leak check initialization
//_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
// uncomment to disable Visual Leak Detector from code
//VLDDisable();
#endif
}

View File

@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef MANGOSSERVER_MEMORY_H
#define MANGOSSERVER_MEMORY_H
#ifndef TRINITYSERVER_MEMORY_H
#define TRINITYSERVER_MEMORY_H
#include "Platform/CompilerDefs.h"
@@ -41,7 +41,7 @@
#include "Policies/Singleton.h"
struct MemoryManager : public MaNGOS::Singleton < MemoryManager >
struct MemoryManager : public Trinity::Singleton < MemoryManager >
{
MemoryManager();
};