1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00

Migrate LodePNG to submodule

We are no longer copy-pasting LodePNG source files directly.

As we can't rename lodepng.cpp to lodepng.c in the submodule itself, we
need to make a wrapper file, lodepng_wrapper.c, that #includes
lodepng.cpp, but gets compiled as C.
This commit is contained in:
Misa 2022-03-13 23:07:46 -07:00 committed by Misa Elizabeth Kai
parent 5bd7dce075
commit 7a0d3046a5
7 changed files with 7 additions and 8530 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "third_party/lodepng"]
path = third_party/lodepng
url = https://github.com/lvandeve/lodepng

View file

@ -185,7 +185,7 @@ if(APPLE)
# Are you noticing a pattern with this Apple crap yet? # Are you noticing a pattern with this Apple crap yet?
set(PFS_SRC ${PFS_SRC} ../third_party/physfs/physfs_platform_apple.m) set(PFS_SRC ${PFS_SRC} ../third_party/physfs/physfs_platform_apple.m)
endif() endif()
set(PNG_SRC ../third_party/lodepng/lodepng.c) set(PNG_SRC src/lodepng_wrapper.c)
if(NOT OFFICIAL_BUILD) if(NOT OFFICIAL_BUILD)
# Add interim commit hash and its date to the build # Add interim commit hash and its date to the build

View file

@ -0,0 +1,2 @@
/* Workaround for being unable to rename lodepng.cpp to lodepng.c */
#include "../../third_party/lodepng/lodepng.cpp"

1
third_party/lodepng vendored Submodule

@ -0,0 +1 @@
Subproject commit 5601b8272a6850b7c5d693dd0c0e16da50be8d8d

View file

@ -1,21 +0,0 @@
Copyright (c) 2005-2018 Lode Vandevenne
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff