Skip to content

Commit

Permalink
Hashing and EName updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dashodanger committed Oct 8, 2024
1 parent 433c079 commit 1ef32d6
Show file tree
Hide file tree
Showing 27 changed files with 7,202 additions and 872 deletions.
22 changes: 22 additions & 0 deletions docs/licenses/BSD 2-Clause.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 6 additions & 4 deletions docs/licenses/License Attribution.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
===========================================================================================
BSD 2-Clause License
===========================================================================================

xxHash library - Copyright (c) 2012-2021 Yann Collet

===========================================================================================
BSD 3-Clause License
===========================================================================================
Expand Down Expand Up @@ -74,8 +80,6 @@ Fluidlite - Copyright (c) 2016 Robin Lobel

SLADE (IMF->WAV conversion and sky drawing routines) - Copyright (c) 2008 - 2023 Simon Judd

SuperFastHash - Copyright (c) 2004-2010 Paul Hsieh

XMIDI library (MIDI conversion) - Copyright (c) 2015-2022 Vitaly Novichkov
Copyright (c) 2015-2016 WildMIDI Developers
Copyright (c) 2014 Bret Curtis
Expand Down Expand Up @@ -159,6 +163,4 @@ WidePix (various assets) - Copyright (c) 2020-2021 Nash Muhandes
zlib License
===========================================================================================

LOVE2D (Windows swapbuffers code) - Copyright (c) 2006-2024 LOVE Development Team

SDL2 library - Copyright (c) 1997-2020 Sam Lantinga
4 changes: 2 additions & 2 deletions libraries/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ add_subdirectory(pl_mpeg)
add_subdirectory(prns)
add_subdirectory(sokol)
add_subdirectory(stb)
add_subdirectory(superfasthash)
add_subdirectory(tracy)
add_subdirectory(tracy)
add_subdirectory(xxHash)
3 changes: 3 additions & 0 deletions libraries/lua/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
##########################################
# Lua
##########################################

set (LUA_SOURCES
lapi.c
Expand Down
8 changes: 0 additions & 8 deletions libraries/superfasthash/CMakeLists.txt

This file was deleted.

674 changes: 0 additions & 674 deletions libraries/superfasthash/LICENSE.txt

This file was deleted.

153 changes: 0 additions & 153 deletions libraries/superfasthash/superfasthash.h

This file was deleted.

7 changes: 7 additions & 0 deletions libraries/xxHash/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
##########################################
# xxHash
##########################################

add_library(xxhash xxhash.cc)

target_include_directories(xxhash PUBLIC ./)
26 changes: 26 additions & 0 deletions libraries/xxHash/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
xxHash Library
Copyright (c) 2012-2021 Yann Collet
All rights reserved.

BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4 changes: 4 additions & 0 deletions libraries/xxHash/xxhash.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#define XXH_STATIC_LINKING_ONLY
#define XXH_IMPLEMENTATION

#include "xxhash.h"
Loading

0 comments on commit 1ef32d6

Please sign in to comment.