From b29c61774cfc8b345d5d9bb0614da4160d522824 Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Thu, 11 Apr 2024 04:25:28 +1000 Subject: [PATCH] normalise license snippets/copyright & cmake stuff --- CMakeLists.txt | 1 - src/CMakeLists.txt | 3 +-- src/argparse.cpp | 3 ++- src/argparse.hpp | 3 ++- src/config.h.in | 1 + src/convert.cpp | 3 ++- src/convert.hpp | 3 ++- src/headerwriter.cpp | 3 ++- src/headerwriter.hpp | 3 ++- src/swriter.cpp | 3 ++- src/swriter.hpp | 3 ++- src/tmx2gba.cpp | 4 +++- src/tmxlayer.hpp | 3 ++- src/tmxmap.cpp | 1 + src/tmxobject.hpp | 3 ++- src/tmxreader.cpp | 3 ++- src/tmxreader.hpp | 3 ++- src/tmxtileset.hpp | 3 ++- 18 files changed, 32 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53667d0..75bb26b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ project(tmx2gba option(USE_ZLIB "Use zlib instead of bundled miniz" "${UNIX}") option(USE_BUNDLED_PUGIXML "Use bundled PUGIXML" ON) option(USE_BUNDLED_ZSTD "Use bundled libzstd" ON) -option(USE_BUNDLED_TMXLITE "Use bundled tmxlite" ON) option(TMX2GBA_DKP_INSTALL "Install into DEVKITPRO prefix" OFF) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ae618c9..594f5cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,8 +20,7 @@ set_target_properties(tmx2gba PROPERTIES CXX_STANDARD_REQUIRED ON) target_compile_definitions(${PROJECT_NAME} PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> # disable msvc warning - $<$:USE_ZLIB>) + $<$:_CRT_SECURE_NO_WARNINGS>) # Disable msvc warning # Enable strong warnings target_compile_options(tmx2gba PRIVATE diff --git a/src/argparse.cpp b/src/argparse.cpp index 933b126..b91eca7 100644 --- a/src/argparse.cpp +++ b/src/argparse.cpp @@ -1,4 +1,5 @@ -/* argparse.cpp - Copyright (C) 2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2024 a dinosaur #include "argparse.hpp" #include diff --git a/src/argparse.hpp b/src/argparse.hpp index f0ef8c8..4cf78b8 100644 --- a/src/argparse.hpp +++ b/src/argparse.hpp @@ -1,4 +1,5 @@ -/* argparse.hpp - Copyright (C) 2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2024 a dinosaur #ifndef ARGPARSE_HPP #define ARGPARSE_HPP diff --git a/src/config.h.in b/src/config.h.in index d544867..a8124b6 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -2,5 +2,6 @@ #define CONFIG_H #define TMX2GBA_VERSION "@PROJECT_VERSION@" +#cmakedefine USE_ZLIB #endif//CONFIG_H diff --git a/src/convert.cpp b/src/convert.cpp index de15bd3..b1f92ab 100644 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -1,4 +1,5 @@ -/* converter.hpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #include "convert.hpp" #include "tmxreader.hpp" diff --git a/src/convert.hpp b/src/convert.hpp index 5aa5ee9..cee3b76 100644 --- a/src/convert.hpp +++ b/src/convert.hpp @@ -1,4 +1,5 @@ -/* converter.hpp - Copyright (C) 2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2024 a dinosaur #ifndef CONVERT_HPP #define CONVERT_HPP diff --git a/src/headerwriter.cpp b/src/headerwriter.cpp index e97f25b..4a87a59 100644 --- a/src/headerwriter.cpp +++ b/src/headerwriter.cpp @@ -1,4 +1,5 @@ -/* headerwriter.cpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #include "headerwriter.hpp" #include diff --git a/src/headerwriter.hpp b/src/headerwriter.hpp index 4ef8077..3c0bb9a 100644 --- a/src/headerwriter.hpp +++ b/src/headerwriter.hpp @@ -1,4 +1,5 @@ -/* headerwriter.hpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #ifndef HEADERWRITER_HPP #define HEADERWRITER_HPP diff --git a/src/swriter.cpp b/src/swriter.cpp index 399de24..ebe6595 100644 --- a/src/swriter.cpp +++ b/src/swriter.cpp @@ -1,4 +1,5 @@ -/* swwriter.cpp - Copyright (C) 2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2024 a dinosaur #include "swriter.hpp" #include diff --git a/src/swriter.hpp b/src/swriter.hpp index b81fee3..9485c53 100644 --- a/src/swriter.hpp +++ b/src/swriter.hpp @@ -1,4 +1,5 @@ -/* swwriter.hpp - Copyright (C) 2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2024 a dinosaur #ifndef SWRITER_HPP #define SWRITER_HPP diff --git a/src/tmx2gba.cpp b/src/tmx2gba.cpp index 1edc03e..8ca3d4f 100644 --- a/src/tmx2gba.cpp +++ b/src/tmx2gba.cpp @@ -1,4 +1,6 @@ -/* tmx2gba.cpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// tmx2gba.cpp - main entry point +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #include "argparse.hpp" #include "tmxreader.hpp" diff --git a/src/tmxlayer.hpp b/src/tmxlayer.hpp index 448d24d..4392f61 100644 --- a/src/tmxlayer.hpp +++ b/src/tmxlayer.hpp @@ -1,4 +1,5 @@ -/* tmxlayer.hpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #ifndef TMXLAYER_HPP #define TMXLAYER_HPP diff --git a/src/tmxmap.cpp b/src/tmxmap.cpp index 07d2bd3..4dbba55 100644 --- a/src/tmxmap.cpp +++ b/src/tmxmap.cpp @@ -2,6 +2,7 @@ // SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #include "tmxmap.hpp" +#include "config.h" #include #include #ifdef USE_ZLIB diff --git a/src/tmxobject.hpp b/src/tmxobject.hpp index 3d734a2..7e6dbfd 100644 --- a/src/tmxobject.hpp +++ b/src/tmxobject.hpp @@ -1,4 +1,5 @@ -/* tmxobject.hpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #ifndef TMXOBJECT_HPP #define TMXOBJECT_HPP diff --git a/src/tmxreader.cpp b/src/tmxreader.cpp index a223856..1b523b0 100644 --- a/src/tmxreader.cpp +++ b/src/tmxreader.cpp @@ -1,4 +1,5 @@ -/* tmxreader.cpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #include "tmxreader.hpp" #include "tmxmap.hpp" diff --git a/src/tmxreader.hpp b/src/tmxreader.hpp index f98fb13..9163763 100644 --- a/src/tmxreader.hpp +++ b/src/tmxreader.hpp @@ -1,4 +1,5 @@ -/* tmxreader.hpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #ifndef TMXREADER_HPP #define TMXREADER_HPP diff --git a/src/tmxtileset.hpp b/src/tmxtileset.hpp index 73466f9..cb8051c 100644 --- a/src/tmxtileset.hpp +++ b/src/tmxtileset.hpp @@ -1,4 +1,5 @@ -/* tmxtileset.hpp - Copyright (C) 2015-2024 a dinosaur (zlib, see COPYING.txt) */ +// SPDX-License-Identifier: Zlib +// SPDX-FileCopyrightText: (c) 2015-2024 a dinosaur #ifndef TMXTILESET_HPP #define TMXTILESET_HPP