From 894675c51288b47740b352b66c588a9d4265da95 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Sun, 12 Jan 2020 12:54:34 -0500 Subject: [PATCH] Create third_party folder, note it in the license text --- LICENSE.md | 2 +- desktop_version/CMakeLists.txt | 37 +++++++++++-------- .../lodepng/lodepng.c | 0 .../lodepng/lodepng.h | 0 .../physfs/LICENSE.txt | 0 .../physfs/README.txt | 0 .../physfs/physfs.c | 0 .../physfs/physfs.h | 0 .../physfs/physfs_archiver_dir.c | 0 .../physfs/physfs_archiver_unpacked.c | 0 .../physfs/physfs_archiver_zip.c | 0 .../physfs/physfs_byteorder.c | 0 .../physfs/physfs_casefolding.h | 0 .../physfs/physfs_internal.h | 0 .../physfs/physfs_miniz.h | 0 .../physfs/physfs_platform_apple.m | 0 .../physfs/physfs_platform_posix.c | 0 .../physfs/physfs_platform_unix.c | 0 .../physfs/physfs_platform_windows.c | 0 .../physfs/physfs_platforms.h | 0 .../physfs/physfs_unicode.c | 0 .../tinyxml/readme.txt | 0 .../tinyxml/tinystr.cpp | 0 .../tinyxml/tinystr.h | 0 .../tinyxml/tinyxml.cpp | 0 .../tinyxml/tinyxml.h | 0 .../tinyxml/tinyxmlerror.cpp | 0 .../tinyxml/tinyxmlparser.cpp | 0 28 files changed, 22 insertions(+), 17 deletions(-) rename {desktop_version => third_party}/lodepng/lodepng.c (100%) rename {desktop_version => third_party}/lodepng/lodepng.h (100%) rename {desktop_version => third_party}/physfs/LICENSE.txt (100%) rename {desktop_version => third_party}/physfs/README.txt (100%) rename {desktop_version => third_party}/physfs/physfs.c (100%) rename {desktop_version => third_party}/physfs/physfs.h (100%) rename {desktop_version => third_party}/physfs/physfs_archiver_dir.c (100%) rename {desktop_version => third_party}/physfs/physfs_archiver_unpacked.c (100%) rename {desktop_version => third_party}/physfs/physfs_archiver_zip.c (100%) rename {desktop_version => third_party}/physfs/physfs_byteorder.c (100%) rename {desktop_version => third_party}/physfs/physfs_casefolding.h (100%) rename {desktop_version => third_party}/physfs/physfs_internal.h (100%) rename {desktop_version => third_party}/physfs/physfs_miniz.h (100%) rename {desktop_version => third_party}/physfs/physfs_platform_apple.m (100%) rename {desktop_version => third_party}/physfs/physfs_platform_posix.c (100%) rename {desktop_version => third_party}/physfs/physfs_platform_unix.c (100%) rename {desktop_version => third_party}/physfs/physfs_platform_windows.c (100%) rename {desktop_version => third_party}/physfs/physfs_platforms.h (100%) rename {desktop_version => third_party}/physfs/physfs_unicode.c (100%) rename {desktop_version => third_party}/tinyxml/readme.txt (100%) rename {desktop_version => third_party}/tinyxml/tinystr.cpp (100%) rename {desktop_version => third_party}/tinyxml/tinystr.h (100%) rename {desktop_version => third_party}/tinyxml/tinyxml.cpp (100%) rename {desktop_version => third_party}/tinyxml/tinyxml.h (100%) rename {desktop_version => third_party}/tinyxml/tinyxmlerror.cpp (100%) rename {desktop_version => third_party}/tinyxml/tinyxmlparser.cpp (100%) diff --git a/LICENSE.md b/LICENSE.md index 0d8ec4d7..3182c58f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -6,7 +6,7 @@ This repo contains the source code for VVVVVV, including all level content and t If you are interested in distributing work that falls outside the terms in the licence below, or if you are interested in distributing work that includes using any part of VVVVVV not included in this repo then please get in touch - we can discuss granting a licence for that on a case by case basis. The purpose of making the contents of this repo available is for others to learn from, to inspire new work, and to allow the creation of new tools and modifications for VVVVVV. -This software available from here is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any claim, damages or other liability arising from the use or in connection with this software. All materials in the repo are copyright of Terry Cavanagh © 2010-2020. +This software available from here is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any claim, damages or other liability arising from the use or in connection with this software. All materials in the repo, with the exception of the contents of the "third_party" directory, are copyright of Terry Cavanagh © 2010-2020. Permission is granted to anyone to use this software and to alter it and redistribute it freely, subject to the following restrictions: diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt index e6157983..0d7099e6 100644 --- a/desktop_version/CMakeLists.txt +++ b/desktop_version/CMakeLists.txt @@ -51,7 +51,12 @@ IF(NOT WIN32) ENDIF() # Include Directories -INCLUDE_DIRECTORIES(src tinyxml physfs lodepng) +INCLUDE_DIRECTORIES( + src + ../third_party/tinyxml + ../third_party/physfs + ../third_party/lodepng +) # Source Lists SET(VVV_SRC @@ -89,27 +94,27 @@ SET(VVV_SRC src/SteamNetwork.c ) SET(XML_SRC - tinyxml/tinystr.cpp - tinyxml/tinyxml.cpp - tinyxml/tinyxmlerror.cpp - tinyxml/tinyxmlparser.cpp + ../third_party/tinyxml/tinystr.cpp + ../third_party/tinyxml/tinyxml.cpp + ../third_party/tinyxml/tinyxmlerror.cpp + ../third_party/tinyxml/tinyxmlparser.cpp ) SET(PFS_SRC - physfs/physfs.c - physfs/physfs_archiver_dir.c - physfs/physfs_archiver_unpacked.c - physfs/physfs_archiver_zip.c - physfs/physfs_byteorder.c - physfs/physfs_unicode.c - physfs/physfs_platform_posix.c - physfs/physfs_platform_unix.c - physfs/physfs_platform_windows.c + ../third_party/physfs/physfs.c + ../third_party/physfs/physfs_archiver_dir.c + ../third_party/physfs/physfs_archiver_unpacked.c + ../third_party/physfs/physfs_archiver_zip.c + ../third_party/physfs/physfs_byteorder.c + ../third_party/physfs/physfs_unicode.c + ../third_party/physfs/physfs_platform_posix.c + ../third_party/physfs/physfs_platform_unix.c + ../third_party/physfs/physfs_platform_windows.c ) IF(APPLE) # Are you noticing a pattern with this Apple crap yet? - SET(PFS_SRC ${PFS_SRC} physfs/physfs_platform_apple.m) + SET(PFS_SRC ${PFS_SRC} ../third_party/physfs/physfs_platform_apple.m) ENDIF() -SET(PNG_SRC lodepng/lodepng.c) +SET(PNG_SRC ../third_party/lodepng/lodepng.c) # Executable information IF(WIN32) diff --git a/desktop_version/lodepng/lodepng.c b/third_party/lodepng/lodepng.c similarity index 100% rename from desktop_version/lodepng/lodepng.c rename to third_party/lodepng/lodepng.c diff --git a/desktop_version/lodepng/lodepng.h b/third_party/lodepng/lodepng.h similarity index 100% rename from desktop_version/lodepng/lodepng.h rename to third_party/lodepng/lodepng.h diff --git a/desktop_version/physfs/LICENSE.txt b/third_party/physfs/LICENSE.txt similarity index 100% rename from desktop_version/physfs/LICENSE.txt rename to third_party/physfs/LICENSE.txt diff --git a/desktop_version/physfs/README.txt b/third_party/physfs/README.txt similarity index 100% rename from desktop_version/physfs/README.txt rename to third_party/physfs/README.txt diff --git a/desktop_version/physfs/physfs.c b/third_party/physfs/physfs.c similarity index 100% rename from desktop_version/physfs/physfs.c rename to third_party/physfs/physfs.c diff --git a/desktop_version/physfs/physfs.h b/third_party/physfs/physfs.h similarity index 100% rename from desktop_version/physfs/physfs.h rename to third_party/physfs/physfs.h diff --git a/desktop_version/physfs/physfs_archiver_dir.c b/third_party/physfs/physfs_archiver_dir.c similarity index 100% rename from desktop_version/physfs/physfs_archiver_dir.c rename to third_party/physfs/physfs_archiver_dir.c diff --git a/desktop_version/physfs/physfs_archiver_unpacked.c b/third_party/physfs/physfs_archiver_unpacked.c similarity index 100% rename from desktop_version/physfs/physfs_archiver_unpacked.c rename to third_party/physfs/physfs_archiver_unpacked.c diff --git a/desktop_version/physfs/physfs_archiver_zip.c b/third_party/physfs/physfs_archiver_zip.c similarity index 100% rename from desktop_version/physfs/physfs_archiver_zip.c rename to third_party/physfs/physfs_archiver_zip.c diff --git a/desktop_version/physfs/physfs_byteorder.c b/third_party/physfs/physfs_byteorder.c similarity index 100% rename from desktop_version/physfs/physfs_byteorder.c rename to third_party/physfs/physfs_byteorder.c diff --git a/desktop_version/physfs/physfs_casefolding.h b/third_party/physfs/physfs_casefolding.h similarity index 100% rename from desktop_version/physfs/physfs_casefolding.h rename to third_party/physfs/physfs_casefolding.h diff --git a/desktop_version/physfs/physfs_internal.h b/third_party/physfs/physfs_internal.h similarity index 100% rename from desktop_version/physfs/physfs_internal.h rename to third_party/physfs/physfs_internal.h diff --git a/desktop_version/physfs/physfs_miniz.h b/third_party/physfs/physfs_miniz.h similarity index 100% rename from desktop_version/physfs/physfs_miniz.h rename to third_party/physfs/physfs_miniz.h diff --git a/desktop_version/physfs/physfs_platform_apple.m b/third_party/physfs/physfs_platform_apple.m similarity index 100% rename from desktop_version/physfs/physfs_platform_apple.m rename to third_party/physfs/physfs_platform_apple.m diff --git a/desktop_version/physfs/physfs_platform_posix.c b/third_party/physfs/physfs_platform_posix.c similarity index 100% rename from desktop_version/physfs/physfs_platform_posix.c rename to third_party/physfs/physfs_platform_posix.c diff --git a/desktop_version/physfs/physfs_platform_unix.c b/third_party/physfs/physfs_platform_unix.c similarity index 100% rename from desktop_version/physfs/physfs_platform_unix.c rename to third_party/physfs/physfs_platform_unix.c diff --git a/desktop_version/physfs/physfs_platform_windows.c b/third_party/physfs/physfs_platform_windows.c similarity index 100% rename from desktop_version/physfs/physfs_platform_windows.c rename to third_party/physfs/physfs_platform_windows.c diff --git a/desktop_version/physfs/physfs_platforms.h b/third_party/physfs/physfs_platforms.h similarity index 100% rename from desktop_version/physfs/physfs_platforms.h rename to third_party/physfs/physfs_platforms.h diff --git a/desktop_version/physfs/physfs_unicode.c b/third_party/physfs/physfs_unicode.c similarity index 100% rename from desktop_version/physfs/physfs_unicode.c rename to third_party/physfs/physfs_unicode.c diff --git a/desktop_version/tinyxml/readme.txt b/third_party/tinyxml/readme.txt similarity index 100% rename from desktop_version/tinyxml/readme.txt rename to third_party/tinyxml/readme.txt diff --git a/desktop_version/tinyxml/tinystr.cpp b/third_party/tinyxml/tinystr.cpp similarity index 100% rename from desktop_version/tinyxml/tinystr.cpp rename to third_party/tinyxml/tinystr.cpp diff --git a/desktop_version/tinyxml/tinystr.h b/third_party/tinyxml/tinystr.h similarity index 100% rename from desktop_version/tinyxml/tinystr.h rename to third_party/tinyxml/tinystr.h diff --git a/desktop_version/tinyxml/tinyxml.cpp b/third_party/tinyxml/tinyxml.cpp similarity index 100% rename from desktop_version/tinyxml/tinyxml.cpp rename to third_party/tinyxml/tinyxml.cpp diff --git a/desktop_version/tinyxml/tinyxml.h b/third_party/tinyxml/tinyxml.h similarity index 100% rename from desktop_version/tinyxml/tinyxml.h rename to third_party/tinyxml/tinyxml.h diff --git a/desktop_version/tinyxml/tinyxmlerror.cpp b/third_party/tinyxml/tinyxmlerror.cpp similarity index 100% rename from desktop_version/tinyxml/tinyxmlerror.cpp rename to third_party/tinyxml/tinyxmlerror.cpp diff --git a/desktop_version/tinyxml/tinyxmlparser.cpp b/third_party/tinyxml/tinyxmlparser.cpp similarity index 100% rename from desktop_version/tinyxml/tinyxmlparser.cpp rename to third_party/tinyxml/tinyxmlparser.cpp