diff options
| author | Kudlaty <none@none> | 2009-08-16 17:30:05 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-08-16 17:30:05 +0200 |
| commit | 683848679649994f048a526be55f776644165827 (patch) | |
| tree | 430b70f8922e6445aaefe1c9f46b70e85acb7e77 /src | |
| parent | 982dcc9eaa3fbddde8b02e0c242387dea1e6f912 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/bindings/scripts/VC80/80ScriptDev2.vcproj | 12 | ||||
| -rw-r--r-- | src/bindings/scripts/VC90/90ScriptDev2.vcproj | 12 | ||||
| -rw-r--r-- | src/bindings/scripts/system/system.cpp (renamed from src/bindings/scripts/system.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/system/system.h | 8 |
5 files changed, 26 insertions, 9 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 0ea35a6b201..3ee74c0e592 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -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}) diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj index 3136b5d6adc..7368025639f 100644 --- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj +++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj @@ -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> diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj index 33a3e2aeca1..ea5fbf72f26 100644 --- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj +++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj @@ -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> diff --git a/src/bindings/scripts/system.cpp b/src/bindings/scripts/system/system.cpp index ab62e530681..ab62e530681 100644 --- a/src/bindings/scripts/system.cpp +++ b/src/bindings/scripts/system/system.cpp diff --git a/src/bindings/scripts/system/system.h b/src/bindings/scripts/system/system.h new file mode 100644 index 00000000000..886f31355a9 --- /dev/null +++ b/src/bindings/scripts/system/system.h @@ -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 |