normalise license snippets/copyright & cmake stuff

2025-02-21 03:29:25 +11:00 · 2024-04-11 04:25:28 +10:00
parent 835b80256f
commit b29c61774c
18 changed files with 32 additions and 17 deletions
--- 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)

--- 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
-	$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>  # disable msvc warning
-	$<$<TARGET_EXISTS:ZLIB::ZLIB>:USE_ZLIB>)
+	$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)  # Disable msvc warning

 # Enable strong warnings
 target_compile_options(tmx2gba PRIVATE
--- 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 <optional>
--- 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
--- 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
--- 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"
--- 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
--- 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 <algorithm>
--- 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
--- 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 <type_traits>
--- 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
--- 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"
--- 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
--- 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 <pugixml.hpp>
 #include <base64.h>
 #ifdef USE_ZLIB
--- 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
--- 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"
--- 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
--- 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