Merge [SD2]

r1306 Remove now empty zone folder and complete re-organize file/folder structure. Thanks to DasBlub, Zor and others for inspiration, help and suggestions.

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-16 17:30:05 +02:00
parent 982dcc9eaa
commit 6838486796
5 changed files with 26 additions and 9 deletions
+2 -1
View File
@@ -510,7 +510,8 @@ SET(trinityscript_LIB_SRCS
scripts/world/npc_taxi.cpp
system/ScriptLoader.cpp
system/ScriptLoader.h
system.cpp
system/system.cpp
system/system.h
)
add_library(trinityscript SHARED ${trinityscript_LIB_SRCS})
@@ -2754,6 +2754,14 @@
RelativePath="..\system\ScriptLoader.h"
>
</File>
<File
RelativePath="..\system\system.cpp"
>
</File>
<File
RelativePath="..\system\system.h"
>
</File>
</Filter>
<File
RelativePath="..\ScriptMgr.cpp"
@@ -2763,10 +2771,6 @@
RelativePath="..\ScriptMgr.h"
>
</File>
<File
RelativePath="..\system.cpp"
>
</File>
</Files>
<Globals>
</Globals>
@@ -2751,6 +2751,14 @@
RelativePath="..\system\ScriptLoader.h"
>
</File>
<File
RelativePath="..\system\system.cpp"
>
</File>
<File
RelativePath="..\system\system.h"
>
</File>
</Filter>
<File
RelativePath="..\ScriptMgr.cpp"
@@ -2760,10 +2768,6 @@
RelativePath="..\ScriptMgr.h"
>
</File>
<File
RelativePath="..\system.cpp"
>
</File>
</Files>
<Globals>
</Globals>
+8
View File
@@ -0,0 +1,8 @@
/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
* This program is free software licensed under GPL version 2
* Please see the included DOCS/LICENSE.TXT for more information */
#ifndef SC_SYSTEM_H
#define SC_SYSTEM_H
#endif