summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2016-01-02 00:47:42 +0100
committerJulian Laubstein <julianlaubstein@yahoo.de>2016-01-02 00:47:42 +0100
commit5c004e375a7c4fab9cbfeb36d63a788bbc883513 (patch)
treeabedc9b67734d9e37a36894b9331ae869d3adb61 /src
parentMerge pull request #2838 from cuberite/clang-3.8-ignore-flag (diff)
parentUpdated plugins with the rename to Cuberite. (diff)
downloadcuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.tar
cuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.tar.gz
cuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.tar.bz2
cuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.tar.lz
cuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.tar.xz
cuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.tar.zst
cuberite-5c004e375a7c4fab9cbfeb36d63a788bbc883513.zip
Diffstat (limited to 'src')
-rw-r--r--src/Bindings/CMakeLists.txt2
-rw-r--r--src/BlockEntities/CMakeLists.txt2
-rw-r--r--src/Blocks/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Cuberite.vcxproj.user27
-rw-r--r--src/Entities/CMakeLists.txt2
-rw-r--r--src/Generating/CMakeLists.txt2
-rw-r--r--src/HTTPServer/CMakeLists.txt2
-rw-r--r--src/Items/CMakeLists.txt2
-rw-r--r--src/MCServer.vcproj.user167
-rw-r--r--src/Mobs/CMakeLists.txt2
-rw-r--r--src/Noise/CMakeLists.txt2
-rw-r--r--src/OSSupport/CMakeLists.txt2
-rw-r--r--src/PolarSSL++/CMakeLists.txt2
-rw-r--r--src/Protocol/CMakeLists.txt2
-rw-r--r--src/Resources/Cuberite.rc (renamed from src/Resources/MCServer.rc)2
-rw-r--r--src/Resources/resource_Cuberite.h (renamed from src/Resources/resource_MCServer.h)0
-rw-r--r--src/Simulator/CMakeLists.txt2
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt2
-rw-r--r--src/UI/CMakeLists.txt2
-rw-r--r--src/WorldStorage/CMakeLists.txt2
21 files changed, 46 insertions, 186 deletions
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 702d38365..10cda1efb 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
include_directories (".")
diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt
index fbf85d2af..6c164c4b4 100644
--- a/src/BlockEntities/CMakeLists.txt
+++ b/src/BlockEntities/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index 1c12d9fbc..e9b3ce386 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2478d4af4..3d9e10aa5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -216,7 +216,7 @@ if (NOT MSVC)
# If building a windows version, but not using MSVC, add the resources directly to the makefile:
if (WIN32)
- list(APPEND SOURCE "Resources/MCServer.rc")
+ list(APPEND SOURCE "Resources/Cuberite.rc")
endif()
else ()
# MSVC-specific handling: Put all files into one project, separate by the folders:
@@ -276,7 +276,7 @@ else ()
SET_SOURCE_FILES_PROPERTIES(
"StackWalker.cpp LeakFinder.cpp" PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""
)
- list(APPEND SOURCE "Resources/MCServer.rc")
+ list(APPEND SOURCE "Resources/Cuberite.rc")
# Make MSVC generate the PDB files even for the release build:
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
diff --git a/src/Cuberite.vcxproj.user b/src/Cuberite.vcxproj.user
new file mode 100644
index 000000000..7ebd19d9b
--- /dev/null
+++ b/src/Cuberite.vcxproj.user
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LocalDebuggerWorkingDirectory>../Server</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseProfile|Win32'">
+ <LocalDebuggerWorkingDirectory>../Server</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
+ <LocalDebuggerWorkingDirectory>../Server</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+ <LocalDebuggerWorkingDirectory>../Server</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LocalDebuggerWorkingDirectory>../Server</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugProfile|Win32'">
+ <LocalDebuggerWorkingDirectory>../Server</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/src/Entities/CMakeLists.txt b/src/Entities/CMakeLists.txt
index 54cca9c90..71964e90d 100644
--- a/src/Entities/CMakeLists.txt
+++ b/src/Entities/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index d15d9eba0..dd346b6c4 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/HTTPServer/CMakeLists.txt b/src/HTTPServer/CMakeLists.txt
index b875b9145..a08a1fcf8 100644
--- a/src/HTTPServer/CMakeLists.txt
+++ b/src/HTTPServer/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt
index 2e719d1a6..9b3a2d8b5 100644
--- a/src/Items/CMakeLists.txt
+++ b/src/Items/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/MCServer.vcproj.user b/src/MCServer.vcproj.user
deleted file mode 100644
index b17909f71..000000000
--- a/src/MCServer.vcproj.user
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioUserFile
- ProjectType="Visual C++"
- Version="9,00"
- ShowAllFiles="false"
- >
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory="..\MCServer"
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="DebugProfile|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory="..\MCServer"
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="MinSizeRel|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory="..\MCServer"
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory="..\MCServer"
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="ReleaseProfile|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory="..\MCServer"
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="ASAGA"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="RelWithDebInfo|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory="..\MCServer"
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- </Configurations>
-</VisualStudioUserFile>
diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index 14c7a8ca3..4336af7c3 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Noise/CMakeLists.txt b/src/Noise/CMakeLists.txt
index 39f3bc975..4e99347f8 100644
--- a/src/Noise/CMakeLists.txt
+++ b/src/Noise/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index ce1d5c530..ee8067c6f 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/PolarSSL++/CMakeLists.txt b/src/PolarSSL++/CMakeLists.txt
index fddb37501..3f268ad13 100644
--- a/src/PolarSSL++/CMakeLists.txt
+++ b/src/PolarSSL++/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Protocol/CMakeLists.txt b/src/Protocol/CMakeLists.txt
index 58a69efbf..cd4f33c60 100644
--- a/src/Protocol/CMakeLists.txt
+++ b/src/Protocol/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Resources/MCServer.rc b/src/Resources/Cuberite.rc
index e0fbbea5d..779487458 100644
--- a/src/Resources/MCServer.rc
+++ b/src/Resources/Cuberite.rc
@@ -5,7 +5,7 @@
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
-#include "resource_MCServer.h"
+#include "resource_Cuberite.h"
diff --git a/src/Resources/resource_MCServer.h b/src/Resources/resource_Cuberite.h
index 42f6c4eaf..42f6c4eaf 100644
--- a/src/Resources/resource_MCServer.h
+++ b/src/Resources/resource_Cuberite.h
diff --git a/src/Simulator/CMakeLists.txt b/src/Simulator/CMakeLists.txt
index a798e4b02..98b4499c7 100644
--- a/src/Simulator/CMakeLists.txt
+++ b/src/Simulator/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
index e37f3595c..87052d00a 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
+++ b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
index ad3c00f5f..6753c453e 100644
--- a/src/UI/CMakeLists.txt
+++ b/src/UI/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
diff --git a/src/WorldStorage/CMakeLists.txt b/src/WorldStorage/CMakeLists.txt
index 2192564e8..1d8b60140 100644
--- a/src/WorldStorage/CMakeLists.txt
+++ b/src/WorldStorage/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-project (MCServer)
+project (Cuberite)
include_directories ("${PROJECT_SOURCE_DIR}/../")
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:38:55 +0100