massive renaming going on (failed svn message)

This commit is contained in:
Enno Rehling 2010-03-05 09:29:48 +01:00
parent 0c328ba728
commit 8baf1aff88
371 changed files with 102 additions and 82 deletions

View File

@ -1,12 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
EndProject
@ -14,7 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "ere
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-basic", "basic\basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "common\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
EndProject
Global
GlobalSection(SubversionScc) = preSolution

View File

@ -1,16 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-basic", "basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
EndProject
Global
GlobalSection(SubversionScc) = preSolution
@ -40,6 +42,10 @@ Global
{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.ActiveCfg = Debug|Win32
{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.Build.0 = Debug|Win32
{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Release|Win32.ActiveCfg = Release|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.ActiveCfg = Debug|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.Build.0 = Debug|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.ActiveCfg = Release|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..;../common;../external"
AdditionalIncludeDirectories="../src;../external"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;../common;../external"
AdditionalIncludeDirectories="../src;../external"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@ -213,7 +213,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\common\build\stdafx.h"
RelativePath="..\src\build\stdafx.h"
>
</File>
</Filter>
@ -221,19 +221,19 @@
Name="Unity Build"
>
<File
RelativePath="..\common\build\external.c"
RelativePath="..\src\build\external.c"
>
</File>
<File
RelativePath="..\common\build\gamecode.c"
RelativePath="..\src\build\gamecode.c"
>
</File>
<File
RelativePath="..\common\build\kernel.c"
RelativePath="..\src\build\kernel.c"
>
</File>
<File
RelativePath="..\common\build\lib.c"
RelativePath="..\src\build\lib.c"
>
</File>
<File
@ -241,7 +241,7 @@
>
</File>
<File
RelativePath="..\common\build\stdafx.c"
RelativePath="..\src\build\stdafx.c"
>
<FileConfiguration
Name="Debug|Win32"
@ -262,14 +262,14 @@
</FileConfiguration>
</File>
<File
RelativePath="..\common\build\util.c"
RelativePath="..\src\build\util.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="common/util"
AdditionalIncludeDirectories="src/util"
/>
</FileConfiguration>
</File>

View File

@ -1,12 +0,0 @@
#include "common/settings.h"
#include <platform.h>
#include "stdafx.h"
#pragma warning(push)
#pragma warning(disable: 4244)
#pragma warning(disable: 4127)
#include <external/sqlite3.c>
#pragma warning(pop)
#include <external/md5.c>
#include <external/bson/bson.c>
#include <external/bson/numbers.c>

View File

@ -1,2 +0,0 @@
#include "common/settings.h"
#include <platform.h>

View File

@ -1,16 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
EndProject
Global
GlobalSection(SubversionScc) = preSolution
@ -28,9 +30,6 @@ Global
{1E8BFF9E-3044-0742-992F-C5765B80FE65}.Debug|Win32.ActiveCfg = Debug|Win32
{1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.ActiveCfg = Release|Win32
{1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.Build.0 = Release|Win32
{D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Debug|Win32.ActiveCfg = Debug|Win32
{D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.ActiveCfg = Release|Win32
{D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.Build.0 = Release|Win32
{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32
{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32
{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.Build.0 = Release|Win32
@ -43,6 +42,10 @@ Global
{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32
{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32
{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.ActiveCfg = Debug|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.Build.0 = Debug|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.ActiveCfg = Release|Win32
{228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..;../common;../external"
AdditionalIncludeDirectories="../src;../external"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;../common;../external"
AdditionalIncludeDirectories="../src;../external"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@ -421,7 +421,7 @@
>
</File>
<File
RelativePath="..\common\build\stdafx.h"
RelativePath="..\src\build\stdafx.h"
>
</File>
<File
@ -433,19 +433,19 @@
Name="Unity Build"
>
<File
RelativePath="..\common\build\external.c"
RelativePath="..\src\build\external.c"
>
</File>
<File
RelativePath="..\common\build\gamecode.c"
RelativePath="..\src\build\gamecode.c"
>
</File>
<File
RelativePath="..\common\build\kernel.c"
RelativePath="..\src\build\kernel.c"
>
</File>
<File
RelativePath="..\common\build\lib.c"
RelativePath="..\src\build\lib.c"
>
</File>
<File
@ -453,7 +453,7 @@
>
</File>
<File
RelativePath="..\common\build\stdafx.c"
RelativePath="..\src\build\stdafx.c"
>
<FileConfiguration
Name="Debug|Win32"
@ -474,14 +474,14 @@
</FileConfiguration>
</File>
<File
RelativePath="..\common\build\util.c"
RelativePath="..\src\build\util.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="common/util"
AdditionalIncludeDirectories="src/util"
/>
</FileConfiguration>
</File>

View File

@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..;../common;../external"
AdditionalIncludeDirectories=".;../src"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -109,7 +109,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
AdditionalIncludeDirectories="..;../common;../external"
AdditionalIncludeDirectories=".;../src"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
@ -201,6 +201,14 @@
<File
RelativePath="..\external\sqlite3.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
WarningLevel="3"
/>
</FileConfiguration>
</File>
</Filter>
<Filter

View File

@ -13,9 +13,10 @@ without prior permission by the authors of Eressea.
#include "helpers.h"
#include <platform.h>
#include <util/attrib.h>
#include <util/base36.h>
#include <util/functions.h>
#include <util/log.h>
#include <util/attrib.h>
#include <kernel/config.h>
#include <kernel/equipment.h>

12
src/src/build/external.c Normal file
View File

@ -0,0 +1,12 @@
#include <settings.h>
#include <platform.h>
#include "stdafx.h"
#pragma warning(push)
#pragma warning(disable: 4244)
#pragma warning(disable: 4127)
#include <sqlite3.c>
#pragma warning(pop)
#include <md5.c>
#include <bson/bson.c>
#include <bson/numbers.c>

View File

@ -1,4 +1,4 @@
#include "common/settings.h"
#include <settings.h>
#include <platform.h>
#include "stdafx.h"

2
src/src/build/stdafx.h Normal file
View File

@ -0,0 +1,2 @@
#include <settings.h>
#include <platform.h>

View File

@ -2,8 +2,8 @@
#include <platform.h>
#include "stdafx.h"
#include <external/iniparser/iniparser.c>
#include <external/mt19937ar.c>
#include <iniparser/iniparser.c>
#include <mt19937ar.c>
#include <util/console.c>
#include <util/attrib.c>

View File

@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..;."
AdditionalIncludeDirectories="."
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -109,7 +109,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
AdditionalIncludeDirectories="..;."
AdditionalIncludeDirectories="."
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"

Some files were not shown because too many files have changed in this diff Show More