From 80e1eb37ddfcbd224fe1d3491201ba8db3e1114f Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 1 Jan 2016 21:05:09 +0100 Subject: Renamed leftover strings to Cuberite / Server, as needed. Also upgraded the user setting file for MSVC to 2013. --- src/Bindings/CMakeLists.txt | 2 +- src/BlockEntities/CMakeLists.txt | 2 +- src/Blocks/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 +- src/Cuberite.vcxproj.user | 27 ++++ src/Entities/CMakeLists.txt | 2 +- src/Generating/CMakeLists.txt | 2 +- src/HTTPServer/CMakeLists.txt | 2 +- src/Items/CMakeLists.txt | 2 +- src/MCServer.vcproj.user | 167 --------------------- src/Mobs/CMakeLists.txt | 2 +- src/Noise/CMakeLists.txt | 2 +- src/OSSupport/CMakeLists.txt | 2 +- src/PolarSSL++/CMakeLists.txt | 2 +- src/Protocol/CMakeLists.txt | 2 +- src/Resources/Cuberite.rc | 17 +++ src/Resources/MCServer.rc | 17 --- src/Resources/resource_Cuberite.h | 5 + src/Resources/resource_MCServer.h | 5 - src/Simulator/CMakeLists.txt | 2 +- .../IncrementalRedstoneSimulator/CMakeLists.txt | 2 +- src/UI/CMakeLists.txt | 2 +- src/WorldStorage/CMakeLists.txt | 2 +- 23 files changed, 67 insertions(+), 207 deletions(-) create mode 100644 src/Cuberite.vcxproj.user delete mode 100644 src/MCServer.vcproj.user create mode 100644 src/Resources/Cuberite.rc delete mode 100644 src/Resources/MCServer.rc create mode 100644 src/Resources/resource_Cuberite.h delete mode 100644 src/Resources/resource_MCServer.h (limited to 'src') 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 @@ + + + + ../Server + WindowsLocalDebugger + + + ../Server + WindowsLocalDebugger + + + ../Server + WindowsLocalDebugger + + + ../Server + WindowsLocalDebugger + + + ../Server + WindowsLocalDebugger + + + ../Server + WindowsLocalDebugger + + \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - 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/Cuberite.rc b/src/Resources/Cuberite.rc new file mode 100644 index 000000000..779487458 --- /dev/null +++ b/src/Resources/Cuberite.rc @@ -0,0 +1,17 @@ +// Generated by ResEdit 1.5.11 +// Copyright (C) 2006-2012 +// http://www.resedit.net + +#include +#include +#include +#include "resource_Cuberite.h" + + + + +// +// Icon resources +// +LANGUAGE 9, SUBLANG_DEFAULT +IDI_ICON1 ICON "icon.ico" diff --git a/src/Resources/MCServer.rc b/src/Resources/MCServer.rc deleted file mode 100644 index e0fbbea5d..000000000 --- a/src/Resources/MCServer.rc +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by ResEdit 1.5.11 -// Copyright (C) 2006-2012 -// http://www.resedit.net - -#include -#include -#include -#include "resource_MCServer.h" - - - - -// -// Icon resources -// -LANGUAGE 9, SUBLANG_DEFAULT -IDI_ICON1 ICON "icon.ico" diff --git a/src/Resources/resource_Cuberite.h b/src/Resources/resource_Cuberite.h new file mode 100644 index 000000000..42f6c4eaf --- /dev/null +++ b/src/Resources/resource_Cuberite.h @@ -0,0 +1,5 @@ +#ifndef IDC_STATIC +#define IDC_STATIC (-1) +#endif + +#define IDI_ICON1 101 diff --git a/src/Resources/resource_MCServer.h b/src/Resources/resource_MCServer.h deleted file mode 100644 index 42f6c4eaf..000000000 --- a/src/Resources/resource_MCServer.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef IDC_STATIC -#define IDC_STATIC (-1) -#endif - -#define IDI_ICON1 101 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}/../") -- cgit v1.2.3