diff options
| author | Aki <please@ignore.pl> | 2024-02-18 02:09:31 +0100 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2024-02-18 02:09:31 +0100 |
| commit | cb0070e5d6de0885de687ef2586d6dc06f5853a0 (patch) | |
| tree | 6cfb054bf49e37ede2b0a9fa6372a4c960aba062 | |
| parent | 67068c9cd91e11800d9a06b386705100a2050da0 (diff) | |
| download | starshatter-cb0070e5d6de0885de687ef2586d6dc06f5853a0.zip starshatter-cb0070e5d6de0885de687ef2586d6dc06f5853a0.tar.gz starshatter-cb0070e5d6de0885de687ef2586d6dc06f5853a0.tar.bz2 | |
Extracted third-party SHA1 to contrib/
| -rw-r--r-- | NOTICE | 6 | ||||
| -rw-r--r-- | StarsEx/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | contrib/sha1/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/sha1/Sha1.cpp (renamed from StarsEx/Sha1.cpp) | 0 | ||||
| -rw-r--r-- | contrib/sha1/include/Sha1.h (renamed from StarsEx/Sha1.h) | 0 |
6 files changed, 14 insertions, 1 deletions
@@ -32,6 +32,8 @@ See <contrib/ogg/COPYING>. Starshatter: The Open Source Project uses OPCODE: Copyright (c) 2001, Pierre Terdiman +OPCODE has been patched in this project to compile under Linux. + Starshatter: The Open Source Project uses vorbis: Copyright (c) 2002-2018, Xiph.org Foundation @@ -43,3 +45,7 @@ Starshatter: The Open Source Project uses zlib: Copyright (c) 1995-2017, Jean-loup Gailly and Mark Adler zlib is released under the zlib license. See <contrib/zlib/zlib.h>. + + +Starshatter: The Open Source Project uses sha1: +Copyright (c) 1998, Paul E. Jones <paulej@acm.org> diff --git a/StarsEx/CMakeLists.txt b/StarsEx/CMakeLists.txt index 1c443b1..0f56b97 100644 --- a/StarsEx/CMakeLists.txt +++ b/StarsEx/CMakeLists.txt @@ -210,7 +210,6 @@ add_library( ScrollWindow.cpp SeekerAI.cpp Sensor.cpp - Sha1.cpp Shadow.cpp Shield.cpp ShieldRep.cpp @@ -285,6 +284,7 @@ target_link_libraries( PUBLIC Ogg::ogg PUBLIC Png::png PUBLIC Opcode + PRIVATE Sha1 ) target_compile_definitions( StarsEx diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 7a8371c..3939f0c 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1,6 +1,7 @@ add_subdirectory(libpng) add_subdirectory(ogg) add_subdirectory(Opcode) +add_subdirectory(sha1) add_subdirectory(vorbis) add_subdirectory(zlib) install( diff --git a/contrib/sha1/CMakeLists.txt b/contrib/sha1/CMakeLists.txt new file mode 100644 index 0000000..cc6fab2 --- /dev/null +++ b/contrib/sha1/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.20) +project(Sha1) +add_library(${PROJECT_NAME} STATIC Sha1.cpp) +target_include_directories( + ${PROJECT_NAME} + PUBLIC include) diff --git a/StarsEx/Sha1.cpp b/contrib/sha1/Sha1.cpp index 7e3de70..7e3de70 100644 --- a/StarsEx/Sha1.cpp +++ b/contrib/sha1/Sha1.cpp diff --git a/StarsEx/Sha1.h b/contrib/sha1/include/Sha1.h index ec64462..ec64462 100644 --- a/StarsEx/Sha1.h +++ b/contrib/sha1/include/Sha1.h |