From b04d8ca99d16669ee71655a0145e6fcdcbb9867e Mon Sep 17 00:00:00 2001 From: Fiftytwo Date: Thu, 16 Nov 2017 20:32:10 +0100 Subject: [PATCH] Clean up redundant files --- src/CPackConfig.cmake | 93 --------------------------------- src/CPackSourceConfig.cmake | 100 ------------------------------------ src/desktop/colobot.rc | 25 --------- src/src/common/config.h | 22 -------- src/src/common/version.h | 7 --- 5 files changed, 247 deletions(-) delete mode 100644 src/CPackConfig.cmake delete mode 100644 src/CPackSourceConfig.cmake delete mode 100644 src/desktop/colobot.rc delete mode 100644 src/src/common/config.h delete mode 100644 src/src/common/version.h diff --git a/src/CPackConfig.cmake b/src/CPackConfig.cmake deleted file mode 100644 index fbcd118a..00000000 --- a/src/CPackConfig.cmake +++ /dev/null @@ -1,93 +0,0 @@ -# This file will be configured to contain variables for CPack. These variables -# should be set in the CMake list file of the project before CPack module is -# included. The list of available CPACK_xxx variables and their associated -# documentation may be obtained using -# cpack --help-variable-list -# -# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME) -# and some are specific to a generator -# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables -# usually begin with CPACK__xxxx. - - -SET(CPACK_BINARY_7Z "OFF") -SET(CPACK_BINARY_BUNDLE "") -SET(CPACK_BINARY_CYGWIN "") -SET(CPACK_BINARY_DEB "") -SET(CPACK_BINARY_DRAGNDROP "") -SET(CPACK_BINARY_IFW "OFF") -SET(CPACK_BINARY_NSIS "ON") -SET(CPACK_BINARY_OSXX11 "") -SET(CPACK_BINARY_PACKAGEMAKER "") -SET(CPACK_BINARY_PRODUCTBUILD "") -SET(CPACK_BINARY_RPM "") -SET(CPACK_BINARY_STGZ "") -SET(CPACK_BINARY_TBZ2 "") -SET(CPACK_BINARY_TGZ "") -SET(CPACK_BINARY_TXZ "") -SET(CPACK_BINARY_TZ "") -SET(CPACK_BINARY_WIX "OFF") -SET(CPACK_BINARY_ZIP "OFF") -SET(CPACK_BUILD_SOURCE_DIRS "C:/Users/Fiftytwo/Repos/colobot;C:/Users/Fiftytwo/Repos/colobot/src") -SET(CPACK_BUNDLE_NAME "Colobot: Gold Edition") -SET(CPACK_CMAKE_GENERATOR "MSYS Makefiles") -SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE") -SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE") -SET(CPACK_GENERATOR "NSIS") -SET(CPACK_INSTALL_CMAKE_PROJECTS "C:/Users/Fiftytwo/Repos/colobot/src;colobot;ALL;/") -SET(CPACK_INSTALL_PREFIX "C:/Program Files (x86)/colobot") -SET(CPACK_MODULE_PATH "C:/Users/Fiftytwo/Repos/colobot/cmake") -SET(CPACK_NSIS_DEFINES "SetOverwrite on -BrandingText \"Colobot: Gold Edition (0.1.11+alpha-git-dev~radda8281)\"") -SET(CPACK_NSIS_DISPLAY_NAME "Colobot") -SET(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") -SET(CPACK_NSIS_INSTALLER_ICON_CODE "!define MUI_HEADERIMAGE_BITMAP \"C:/Users/Fiftytwo/Repos/colobot/desktop/colobot_nsis.bmp\" - !define MUI_WELCOMEFINISHPAGE_BITMAP \"C:/Users/Fiftytwo/Repos/colobot/desktop/colobot_nsis_left.bmp\"") -SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "") -SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") -SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "colobot.exe") -SET(CPACK_NSIS_MUI_ICON "C:/Users/Fiftytwo/Repos/colobot/desktop/colobot.ico") -SET(CPACK_NSIS_MUI_UNIICON "C:/Users/Fiftytwo/Repos/colobot/desktop/colobot.ico") -SET(CPACK_NSIS_PACKAGE_NAME "Colobot") -SET(CPACK_OUTPUT_CONFIG_FILE "C:/Users/Fiftytwo/Repos/colobot/src/CPackConfig.cmake") -SET(CPACK_PACKAGE_DEFAULT_LOCATION "/") -SET(CPACK_PACKAGE_DESCRIPTION_FILE "C:/Users/Fiftytwo/Repos/colobot/desktop/../README.md") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Colobot: Gold Edition") -SET(CPACK_PACKAGE_EXECUTABLES "colobot;Colobot: Gold Edition") -SET(CPACK_PACKAGE_FILE_NAME "colobot-0.1.11+alpha-git-dev~radda8281") -SET(CPACK_PACKAGE_ICON "") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Colobot") -SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Colobot") -SET(CPACK_PACKAGE_NAME "colobot") -SET(CPACK_PACKAGE_RELOCATABLE "true") -SET(CPACK_PACKAGE_VENDOR "TerranovaTeam") -SET(CPACK_PACKAGE_VERSION "0.1.11") -SET(CPACK_PACKAGE_VERSION_MAJOR "0") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "11") -SET(CPACK_RESOURCE_FILE_LICENSE "C:/Users/Fiftytwo/Repos/colobot/desktop/../LICENSE.txt") -SET(CPACK_RESOURCE_FILE_README "C:/msys64/mingw64/share/cmake-3.9/Templates/CPack.GenericDescription.txt") -SET(CPACK_RESOURCE_FILE_WELCOME "C:/msys64/mingw64/share/cmake-3.9/Templates/CPack.GenericWelcome.txt") -SET(CPACK_SET_DESTDIR "OFF") -SET(CPACK_SOURCE_7Z "ON") -SET(CPACK_SOURCE_CYGWIN "") -SET(CPACK_SOURCE_GENERATOR "7Z;ZIP") -SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "C:/Users/Fiftytwo/Repos/colobot/src/CPackSourceConfig.cmake") -SET(CPACK_SOURCE_RPM "") -SET(CPACK_SOURCE_TBZ2 "") -SET(CPACK_SOURCE_TGZ "") -SET(CPACK_SOURCE_TXZ "") -SET(CPACK_SOURCE_TZ "") -SET(CPACK_SOURCE_ZIP "ON") -SET(CPACK_STRIP_FILES "TRUE") -SET(CPACK_SYSTEM_NAME "win64") -SET(CPACK_TOPLEVEL_TAG "win64") -SET(CPACK_WIX_SIZEOF_VOID_P "8") - -if(NOT CPACK_PROPERTIES_FILE) - set(CPACK_PROPERTIES_FILE "C:/Users/Fiftytwo/Repos/colobot/src/CPackProperties.cmake") -endif() - -if(EXISTS ${CPACK_PROPERTIES_FILE}) - include(${CPACK_PROPERTIES_FILE}) -endif() diff --git a/src/CPackSourceConfig.cmake b/src/CPackSourceConfig.cmake deleted file mode 100644 index d6dddd85..00000000 --- a/src/CPackSourceConfig.cmake +++ /dev/null @@ -1,100 +0,0 @@ -# This file will be configured to contain variables for CPack. These variables -# should be set in the CMake list file of the project before CPack module is -# included. The list of available CPACK_xxx variables and their associated -# documentation may be obtained using -# cpack --help-variable-list -# -# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME) -# and some are specific to a generator -# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables -# usually begin with CPACK__xxxx. - - -SET(CPACK_BINARY_7Z "OFF") -SET(CPACK_BINARY_BUNDLE "") -SET(CPACK_BINARY_CYGWIN "") -SET(CPACK_BINARY_DEB "") -SET(CPACK_BINARY_DRAGNDROP "") -SET(CPACK_BINARY_IFW "OFF") -SET(CPACK_BINARY_NSIS "ON") -SET(CPACK_BINARY_OSXX11 "") -SET(CPACK_BINARY_PACKAGEMAKER "") -SET(CPACK_BINARY_PRODUCTBUILD "") -SET(CPACK_BINARY_RPM "") -SET(CPACK_BINARY_STGZ "") -SET(CPACK_BINARY_TBZ2 "") -SET(CPACK_BINARY_TGZ "") -SET(CPACK_BINARY_TXZ "") -SET(CPACK_BINARY_TZ "") -SET(CPACK_BINARY_WIX "OFF") -SET(CPACK_BINARY_ZIP "OFF") -SET(CPACK_BUILD_SOURCE_DIRS "C:/Users/Fiftytwo/Repos/colobot;C:/Users/Fiftytwo/Repos/colobot/src") -SET(CPACK_BUNDLE_NAME "Colobot: Gold Edition") -SET(CPACK_CMAKE_GENERATOR "MSYS Makefiles") -SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE") -SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE") -SET(CPACK_GENERATOR "7Z;ZIP") -SET(CPACK_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp\$;\\.#;/#") -SET(CPACK_INSTALLED_DIRECTORIES "C:/Users/Fiftytwo/Repos/colobot;/") -SET(CPACK_INSTALL_CMAKE_PROJECTS "") -SET(CPACK_INSTALL_PREFIX "C:/Program Files (x86)/colobot") -SET(CPACK_MODULE_PATH "C:/Users/Fiftytwo/Repos/colobot/cmake") -SET(CPACK_NSIS_DEFINES "SetOverwrite on -BrandingText \"Colobot: Gold Edition (0.1.11+alpha-git-dev~radda8281)\"") -SET(CPACK_NSIS_DISPLAY_NAME "Colobot") -SET(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") -SET(CPACK_NSIS_INSTALLER_ICON_CODE "!define MUI_HEADERIMAGE_BITMAP \"C:/Users/Fiftytwo/Repos/colobot/desktop/colobot_nsis.bmp\" - !define MUI_WELCOMEFINISHPAGE_BITMAP \"C:/Users/Fiftytwo/Repos/colobot/desktop/colobot_nsis_left.bmp\"") -SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "") -SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") -SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "colobot.exe") -SET(CPACK_NSIS_MUI_ICON "C:/Users/Fiftytwo/Repos/colobot/desktop/colobot.ico") -SET(CPACK_NSIS_MUI_UNIICON "C:/Users/Fiftytwo/Repos/colobot/desktop/colobot.ico") -SET(CPACK_NSIS_PACKAGE_NAME "Colobot") -SET(CPACK_OUTPUT_CONFIG_FILE "C:/Users/Fiftytwo/Repos/colobot/src/CPackConfig.cmake") -SET(CPACK_PACKAGE_DEFAULT_LOCATION "/") -SET(CPACK_PACKAGE_DESCRIPTION_FILE "C:/Users/Fiftytwo/Repos/colobot/desktop/../README.md") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Colobot: Gold Edition") -SET(CPACK_PACKAGE_EXECUTABLES "colobot;Colobot: Gold Edition") -SET(CPACK_PACKAGE_FILE_NAME "colobot-0.1.11-Source") -SET(CPACK_PACKAGE_ICON "") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Colobot") -SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Colobot") -SET(CPACK_PACKAGE_NAME "colobot") -SET(CPACK_PACKAGE_RELOCATABLE "true") -SET(CPACK_PACKAGE_VENDOR "TerranovaTeam") -SET(CPACK_PACKAGE_VERSION "0.1.11") -SET(CPACK_PACKAGE_VERSION_MAJOR "0") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "11") -SET(CPACK_RESOURCE_FILE_LICENSE "C:/Users/Fiftytwo/Repos/colobot/desktop/../LICENSE.txt") -SET(CPACK_RESOURCE_FILE_README "C:/msys64/mingw64/share/cmake-3.9/Templates/CPack.GenericDescription.txt") -SET(CPACK_RESOURCE_FILE_WELCOME "C:/msys64/mingw64/share/cmake-3.9/Templates/CPack.GenericWelcome.txt") -SET(CPACK_RPM_PACKAGE_SOURCES "ON") -SET(CPACK_SET_DESTDIR "OFF") -SET(CPACK_SOURCE_7Z "ON") -SET(CPACK_SOURCE_CYGWIN "") -SET(CPACK_SOURCE_GENERATOR "7Z;ZIP") -SET(CPACK_SOURCE_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp\$;\\.#;/#") -SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "C:/Users/Fiftytwo/Repos/colobot;/") -SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "C:/Users/Fiftytwo/Repos/colobot/src/CPackSourceConfig.cmake") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "colobot-0.1.11-Source") -SET(CPACK_SOURCE_RPM "") -SET(CPACK_SOURCE_TBZ2 "") -SET(CPACK_SOURCE_TGZ "") -SET(CPACK_SOURCE_TOPLEVEL_TAG "win64-Source") -SET(CPACK_SOURCE_TXZ "") -SET(CPACK_SOURCE_TZ "") -SET(CPACK_SOURCE_ZIP "ON") -SET(CPACK_STRIP_FILES "") -SET(CPACK_SYSTEM_NAME "win64") -SET(CPACK_TOPLEVEL_TAG "win64-Source") -SET(CPACK_WIX_SIZEOF_VOID_P "8") - -if(NOT CPACK_PROPERTIES_FILE) - set(CPACK_PROPERTIES_FILE "C:/Users/Fiftytwo/Repos/colobot/src/CPackProperties.cmake") -endif() - -if(EXISTS ${CPACK_PROPERTIES_FILE}) - include(${CPACK_PROPERTIES_FILE}) -endif() diff --git a/src/desktop/colobot.rc b/src/desktop/colobot.rc deleted file mode 100644 index 5187a5af..00000000 --- a/src/desktop/colobot.rc +++ /dev/null @@ -1,25 +0,0 @@ -id ICON "C:/Users/Fiftytwo/Repos/colobot/desktop/colobot.ico" - -1 VERSIONINFO -FILEVERSION 0,1,11,0 -PRODUCTVERSION 0,1,11,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "OriginalFilename", "colobot.exe\0" - VALUE "InternalName", "colobot\0" - VALUE "FileDescription", "Colobot: Gold Edition - Colonize with Bots\0" - VALUE "ProductName", "Colobot: Gold Edition\0" - VALUE "CompanyName", "TerranovaTeam\0" - VALUE "LegalCopyright", "Copyright (c) 2012-2014 TerranovaTeam\0" - VALUE "FileVersion", "0.1.11+alpha-git-dev~radda8281\0" - VALUE "ProductVersion", "0.1.11+alpha-git-dev~radda8281\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/src/src/common/config.h b/src/src/common/config.h deleted file mode 100644 index 196d9900..00000000 --- a/src/src/common/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -// Macros set by CMake -#define PLATFORM_WINDOWS 1 -/* #undef PLATFORM_LINUX */ -/* #undef PLATFORM_GNU */ -/* #undef PLATFORM_MACOSX */ -/* #undef PLATFORM_OTHER */ - -#ifdef PLATFORM_MACOSX -// Assume we have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework -#define HAVE_CFLOCALECOPYCURRENT 1 -#endif - -/* #undef GLEW_STATIC */ - -#define OPENAL_SOUND - -/* #undef PORTABLE */ - -#define COLOBOT_DEFAULT_DATADIR "C:/Program Files (x86)/colobot/data" -#define COLOBOT_I18N_DIR "C:/Program Files (x86)/colobot/lang" diff --git a/src/src/common/version.h b/src/src/common/version.h deleted file mode 100644 index 61cea590..00000000 --- a/src/src/common/version.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#define COLOBOT_FULLNAME "Colobot: Gold Edition 0.1.11+alpha-git-dev~radda8281" -#define COLOBOT_VERSION_DISPLAY "git-dev~radda8281" - -#define BUILD_NUMBER 0 -/* #undef OFFICIAL_BUILD */