Permalink
Browse files

Merge pull request #181 from stfx/fix_compile

Fix compile after recent core git_id changes

Close #182
  • Loading branch information...
xfurry committed Sep 3, 2015
2 parents 4f12a4c + 083521b commit 4550c59d319a3535eceff9f87ee72fab046577cd
Showing with 0 additions and 14 deletions.
  1. +0 −6 ScriptMgr.cpp
  2. +0 −8 system/MangosdRev.cpp
View
@@ -252,12 +252,6 @@ void Script::RegisterSelf(bool bReportError)
//********************************
//*** Functions to be Exported ***
MANGOS_DLL_EXPORT
char const* GetScriptLibraryVersion()
{
return strSD2Version.c_str();
}
MANGOS_DLL_EXPORT
bool GossipHello(Player* pPlayer, Creature* pCreature)
{
View
@@ -2,18 +2,10 @@
* This program is free software licensed under GPL version 2
* Please see the included DOCS/LICENSE.TXT for more information */
#include "../../../shared/revision_nr.h"
#ifdef WIN32
# define MANGOS_DLL_EXPORT extern "C" __declspec(dllexport)
#elif defined( __GNUC__ )
# define MANGOS_DLL_EXPORT extern "C"
#else
# define MANGOS_DLL_EXPORT extern "C" export
#endif
MANGOS_DLL_EXPORT
char const* GetMangosRevStr()
{
return REVISION_NR;
}

3 comments on commit 4550c59

@Bestmore

This comment has been minimized.

Show comment
Hide comment
@Bestmore

Bestmore Oct 18, 2015

1>------ Build started: Project: ScriptDev2, Configuration: Release Win32 ------
1> Extracting revision
1> Системе не удается найти указанный путь.
1>C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(170,5): error MSB6006: "cmd.exe" exited with code 3.
========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========

1>------ Build started: Project: ScriptDev2, Configuration: Release Win32 ------
1> Extracting revision
1> Системе не удается найти указанный путь.
1>C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(170,5): error MSB6006: "cmd.exe" exited with code 3.
========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========

@xfurry

This comment has been minimized.

Show comment
Hide comment
@xfurry

xfurry Oct 19, 2015

Member

SD2 has been integrated into the core after cmangos/mangos-wotlk@4d3e9eb
Please update to the latest core.

Member

xfurry replied Oct 19, 2015

SD2 has been integrated into the core after cmangos/mangos-wotlk@4d3e9eb
Please update to the latest core.

@Rushor

This comment has been minimized.

Show comment
Hide comment
@Rushor

Rushor Dec 24, 2015

merry xmas guys 🎄

merry xmas guys 🎄

Please sign in to comment.