From 140e7e5de92176216a6fa1bf06fd5041c19869ed Mon Sep 17 00:00:00 2001 From: Ropufu Date: Fri, 30 Jul 2021 10:03:53 -0400 Subject: [PATCH] Enable VS installation on Windows with vcpkg. --- CMakeLists.txt | 60 ++------ Packaging/resources/LICENSE.freetype.txt | 173 +++++++++++++++++++++++ Packaging/resources/README-SDL.txt | 13 ++ 3 files changed, 196 insertions(+), 50 deletions(-) create mode 100644 Packaging/resources/LICENSE.freetype.txt create mode 100644 Packaging/resources/README-SDL.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 0611f9acc..85d133db4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -940,7 +940,7 @@ if(NINTENDO_3DS) endif() if(CPACK) - if(NOT SYSTEM_BITS MATCHES x64 AND WIN32) + if(WIN32) set(CPACK_PACKAGE_FILE_NAME "devilutionx") set(CPACK_PACKAGE_NAME ${project_name}) set(CPACK_GENERATOR "ZIP") @@ -955,62 +955,22 @@ if(CPACK) install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/devilutionx.mpq" DESTINATION "." ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/libfreetype-6.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2-2.0.14/i686-w64-mingw32/bin/SDL2.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/SDL2_ttf.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/zlib1.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/LICENSE.CharisSILB.txt" - DESTINATION "LICENSE" - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/LICENSE.freetype.txt" - DESTINATION "LICENSE" - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2-2.0.14/README-SDL.txt" - DESTINATION "LICENSE" - ) - - elseif(SYSTEM_BITS MATCHES x64 AND WIN32) - set(CPACK_PACKAGE_FILE_NAME "devilutionx") - set(CPACK_PACKAGE_NAME ${project_name}) - set(CPACK_GENERATOR "ZIP") - set(CPACK_STRIP_FILES TRUE) - install(TARGETS ${BIN_TARGET} DESTINATION .) - install(FILES "${PROJECT_SOURCE_DIR}/Packaging/windows/README.txt" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/devilutionx.mpq" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/libfreetype-6.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2-2.0.14/x86_64-w64-mingw32/bin/SDL2.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/SDL2_ttf.dll" - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/zlib1.dll" + install(DIRECTORY "${CMAKE_BINARY_DIR}/" DESTINATION "." + FILES_MATCHING PATTERN "*.dll" + PATTERN "Testing" EXCLUDE + PATTERN "CMakeFiles" EXCLUDE + PATTERN "3rdParty" EXCLUDE + PATTERN "_deps" EXCLUDE + PATTERN ".cmake" EXCLUDE ) install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/LICENSE.CharisSILB.txt" DESTINATION "LICENSE" ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/LICENSE.freetype.txt" + install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/LICENSE.freetype.txt" DESTINATION "LICENSE" ) - install(FILES "${PROJECT_SOURCE_DIR}/SDL2-2.0.14/README-SDL.txt" + install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/README-SDL.txt" DESTINATION "LICENSE" ) diff --git a/Packaging/resources/LICENSE.freetype.txt b/Packaging/resources/LICENSE.freetype.txt new file mode 100644 index 000000000..5fb9b74e1 --- /dev/null +++ b/Packaging/resources/LICENSE.freetype.txt @@ -0,0 +1,173 @@ +The source code to this library used with SDL_ttf can be found here: +https://hg.libsdl.org/SDL_ttf/file/default/external +--- + + The FreeType Project LICENSE + ---------------------------- + + 2006-Jan-27 + + Copyright 1996-2002, 2006 by + David Turner, Robert Wilhelm, and Werner Lemberg + + + +Introduction +============ + + The FreeType Project is distributed in several archive packages; + some of them may contain, in addition to the FreeType font engine, + various tools and contributions which rely on, or relate to, the + FreeType Project. + + This license applies to all files found in such packages, and + which do not fall under their own explicit license. The license + affects thus the FreeType font engine, the test programs, + documentation and makefiles, at the very least. + + This license was inspired by the BSD, Artistic, and IJG + (Independent JPEG Group) licenses, which all encourage inclusion + and use of free software in commercial and freeware products + alike. As a consequence, its main points are that: + + o We don't promise that this software works. However, we will be + interested in any kind of bug reports. (`as is' distribution) + + o You can use this software for whatever you want, in parts or + full form, without having to pay us. (`royalty-free' usage) + + o You may not pretend that you wrote this software. If you use + it, or only parts of it, in a program, you must acknowledge + somewhere in your documentation that you have used the + FreeType code. (`credits') + + We specifically permit and encourage the inclusion of this + software, with or without modifications, in commercial products. + We disclaim all warranties covering The FreeType Project and + assume no liability related to The FreeType Project. + + + Finally, many people asked us for a preferred form for a + credit/disclaimer to use in compliance with this license. We thus + encourage you to use the following text: + + """ + Portions of this software are copyright © The FreeType + Project (www.freetype.org). All rights reserved. + """ + + Please replace with the value from the FreeType version you + actually use. + + +Legal Terms +=========== + +0. Definitions +-------------- + + Throughout this license, the terms `package', `FreeType Project', + and `FreeType archive' refer to the set of files originally + distributed by the authors (David Turner, Robert Wilhelm, and + Werner Lemberg) as the `FreeType Project', be they named as alpha, + beta or final release. + + `You' refers to the licensee, or person using the project, where + `using' is a generic term including compiling the project's source + code as well as linking it to form a `program' or `executable'. + This program is referred to as `a program using the FreeType + engine'. + + This license applies to all files distributed in the original + FreeType Project, including all source code, binaries and + documentation, unless otherwise stated in the file in its + original, unmodified form as distributed in the original archive. + If you are unsure whether or not a particular file is covered by + this license, you must contact us to verify this. + + The FreeType Project is copyright (C) 1996-2000 by David Turner, + Robert Wilhelm, and Werner Lemberg. All rights reserved except as + specified below. + +1. No Warranty +-------------- + + THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO + USE, OF THE FREETYPE PROJECT. + +2. Redistribution +----------------- + + This license grants a worldwide, royalty-free, perpetual and + irrevocable right and license to use, execute, perform, compile, + display, copy, create derivative works of, distribute and + sublicense the FreeType Project (in both source and object code + forms) and derivative works thereof for any purpose; and to + authorize others to exercise some or all of the rights granted + herein, subject to the following conditions: + + o Redistribution of source code must retain this license file + (`FTL.TXT') unaltered; any additions, deletions or changes to + the original files must be clearly indicated in accompanying + documentation. The copyright notices of the unaltered, + original files must be preserved in all copies of source + files. + + o Redistribution in binary form must provide a disclaimer that + states that the software is based in part of the work of the + FreeType Team, in the distribution documentation. We also + encourage you to put an URL to the FreeType web page in your + documentation, though this isn't mandatory. + + These conditions apply to any software derived from or based on + the FreeType Project, not just the unmodified files. If you use + our work, you must acknowledge us. However, no fee need be paid + to us. + +3. Advertising +-------------- + + Neither the FreeType authors and contributors nor you shall use + the name of the other for commercial, advertising, or promotional + purposes without specific prior written permission. + + We suggest, but do not require, that you use one or more of the + following phrases to refer to this software in your documentation + or advertising materials: `FreeType Project', `FreeType Engine', + `FreeType library', or `FreeType Distribution'. + + As you have not signed this license, you are not required to + accept it. However, as the FreeType Project is copyrighted + material, only this license, or another one contracted with the + authors, grants you the right to use, distribute, and modify it. + Therefore, by using, distributing, or modifying the FreeType + Project, you indicate that you understand and accept all the terms + of this license. + +4. Contacts +----------- + + There are two mailing lists related to FreeType: + + o freetype@nongnu.org + + Discusses general use and applications of FreeType, as well as + future and wanted additions to the library and distribution. + If you are looking for support, start in this list if you + haven't found anything to help you in the documentation. + + o freetype-devel@nongnu.org + + Discusses bugs, as well as engine internals, design issues, + specific licenses, porting, etc. + + Our home page can be found at + + https://www.freetype.org + + +--- end of FTL.TXT --- diff --git a/Packaging/resources/README-SDL.txt b/Packaging/resources/README-SDL.txt new file mode 100644 index 000000000..8d92955a9 --- /dev/null +++ b/Packaging/resources/README-SDL.txt @@ -0,0 +1,13 @@ + +Please distribute this file with the SDL runtime environment: + +The Simple DirectMedia Layer (SDL for short) is a cross-platform library +designed to make it easy to write multi-media software, such as games +and emulators. + +The Simple DirectMedia Layer library source code is available from: +https://www.libsdl.org/ + +This library is distributed under the terms of the zlib license: +http://www.zlib.net/zlib_license.html +