From 1a453c7f3fbe72173789f5b990d2dc6919c0785d Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Wed, 27 Jul 2022 21:10:35 +0200
Subject: [PATCH] Remove zlib related files from .gitignore
---
.gitignore | 4 -
conan.lock | 55 -------
conanbuildinfo.txt | 346 ---------------------------------------------
conanfile.py | 10 --
conaninfo.txt | 24 ----
graph_info.json | 9 --
6 files changed, 448 deletions(-)
delete mode 100644 conan.lock
delete mode 100644 conanbuildinfo.txt
delete mode 100644 conanfile.py
delete mode 100644 conaninfo.txt
delete mode 100644 graph_info.json
diff --git a/.gitignore b/.gitignore
index 256ac82f..17895a27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,3 @@ Release
*.suo
*.sdf
*.opensdf
-
-# generated zlib files
-external/zlib-1.2.11/zconf.h
-external/zlib-1.2.11/zconf.h.included
diff --git a/conan.lock b/conan.lock
deleted file mode 100644
index 106a0241..00000000
--- a/conan.lock
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "graph_lock": {
- "nodes": {
- "0": {
- "options": "",
- "build_requires": [
- "1",
- "3"
- ],
- "path": "conanfile.py",
- "context": "host"
- },
- "1": {
- "ref": "autoconf/2.71",
- "options": "",
- "package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
- "prev": "0",
- "requires": [
- "2"
- ],
- "context": "host"
- },
- "2": {
- "ref": "m4/1.4.19",
- "options": "",
- "package_id": "24647d9fe8ec489125dfbae4b3ebefaf7581674c",
- "prev": "0",
- "context": "host"
- },
- "3": {
- "ref": "libtool/2.4.6",
- "options": "fPIC=True\nshared=False",
- "package_id": "ed03dd185916c6a62cfea9667c4eb5fa400961da",
- "prev": "0",
- "requires": [
- "4"
- ],
- "context": "host"
- },
- "4": {
- "ref": "automake/1.16.5",
- "options": "",
- "package_id": "258f6f05ca54813b3d7180161753df7f9ccf7e1d",
- "prev": "0",
- "requires": [
- "1"
- ],
- "context": "host"
- }
- },
- "revisions_enabled": false
- },
- "version": "0.4",
- "profile_host": "[settings]\narch=x86_64\narch_build=x86_64\nbuild_type=Release\ncompiler=gcc\ncompiler.libcxx=libstdc++11\ncompiler.version=12\nos=Linux\nos_build=Linux\n[options]\n[build_requires]\n[env]\nCC=/usr/bin/gcc\nCXX=/usr/bin/g++"
-}
\ No newline at end of file
diff --git a/conanbuildinfo.txt b/conanbuildinfo.txt
deleted file mode 100644
index 2c9bfae6..00000000
--- a/conanbuildinfo.txt
+++ /dev/null
@@ -1,346 +0,0 @@
-[includedirs]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/include
-
-[libdirs]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/lib
-
-[bindirs]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/bin
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/bin
-/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin
-/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c/bin
-
-[resdirs]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res
-
-[builddirs]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/
-/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/
-/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c/
-
-[libs]
-ltdl
-
-[system_libs]
-dl
-
-[defines]
-
-
-[cppflags]
-
-
-[cxxflags]
-
-
-[cflags]
-
-
-[sharedlinkflags]
-
-
-[exelinkflags]
-
-
-[sysroot]
-
-
-[frameworks]
-
-
-[frameworkdirs]
-
-
-
-[includedirs_libtool]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/include
-
-[libdirs_libtool]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/lib
-
-[bindirs_libtool]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/bin
-
-[resdirs_libtool]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res
-
-[builddirs_libtool]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/
-
-[libs_libtool]
-ltdl
-
-[system_libs_libtool]
-dl
-
-[defines_libtool]
-
-
-[cppflags_libtool]
-
-
-[cxxflags_libtool]
-
-
-[cflags_libtool]
-
-
-[sharedlinkflags_libtool]
-
-
-[exelinkflags_libtool]
-
-
-[sysroot_libtool]
-
-
-[frameworks_libtool]
-
-
-[frameworkdirs_libtool]
-
-
-[rootpath_libtool]
-/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da
-
-[name_libtool]
-libtool
-
-[version_libtool]
-2.4.6
-
-[generatornames_libtool]
-
-
-[generatorfilenames_libtool]
-
-
-
-[includedirs_automake]
-
-
-[libdirs_automake]
-
-
-[bindirs_automake]
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/bin
-
-[resdirs_automake]
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res
-
-[builddirs_automake]
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/
-
-[libs_automake]
-
-
-[system_libs_automake]
-
-
-[defines_automake]
-
-
-[cppflags_automake]
-
-
-[cxxflags_automake]
-
-
-[cflags_automake]
-
-
-[sharedlinkflags_automake]
-
-
-[exelinkflags_automake]
-
-
-[sysroot_automake]
-
-
-[frameworks_automake]
-
-
-[frameworkdirs_automake]
-
-
-[rootpath_automake]
-/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d
-
-[name_automake]
-automake
-
-[version_automake]
-1.16.5
-
-[generatornames_automake]
-
-
-[generatorfilenames_automake]
-
-
-
-[includedirs_autoconf]
-
-
-[libdirs_autoconf]
-
-
-[bindirs_autoconf]
-/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin
-
-[resdirs_autoconf]
-
-
-[builddirs_autoconf]
-/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/
-
-[libs_autoconf]
-
-
-[system_libs_autoconf]
-
-
-[defines_autoconf]
-
-
-[cppflags_autoconf]
-
-
-[cxxflags_autoconf]
-
-
-[cflags_autoconf]
-
-
-[sharedlinkflags_autoconf]
-
-
-[exelinkflags_autoconf]
-
-
-[sysroot_autoconf]
-
-
-[frameworks_autoconf]
-
-
-[frameworkdirs_autoconf]
-
-
-[rootpath_autoconf]
-/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9
-
-[name_autoconf]
-autoconf
-
-[version_autoconf]
-2.71
-
-[generatornames_autoconf]
-
-
-[generatorfilenames_autoconf]
-
-
-
-[includedirs_m4]
-
-
-[libdirs_m4]
-
-
-[bindirs_m4]
-/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c/bin
-
-[resdirs_m4]
-
-
-[builddirs_m4]
-/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c/
-
-[libs_m4]
-
-
-[system_libs_m4]
-
-
-[defines_m4]
-
-
-[cppflags_m4]
-
-
-[cxxflags_m4]
-
-
-[cflags_m4]
-
-
-[sharedlinkflags_m4]
-
-
-[exelinkflags_m4]
-
-
-[sysroot_m4]
-
-
-[frameworks_m4]
-
-
-[frameworkdirs_m4]
-
-
-[rootpath_m4]
-/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c
-
-[name_m4]
-m4
-
-[version_m4]
-1.4.19
-
-[generatornames_m4]
-
-
-[generatorfilenames_m4]
-
-
-
-[USER_autoconf]
-[USER_automake]
-ar_lib=/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res/automake-1.16/ar-lib
-compile=/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res/automake-1.16/compile
-[USER_libtool]
-[USER_m4]
-[ENV_libtool]
-ACLOCAL_PATH=["/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res/aclocal"]
-AUTOMAKE_CONAN_INCLUDES=["/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res/aclocal"]
-LIBTOOLIZE=/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/bin/libtoolize
-LIBTOOL_ACLOCALDIR=/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res/aclocal
-LIBTOOL_DATADIR=/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res
-LIBTOOL_PKGAUXDIR=/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res/libtool/build-aux
-LIBTOOL_PKGLTDLDIR=/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/res/libtool
-LIBTOOL_PREFIX=/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da
-PATH=["/home/maarten/.conan/data/libtool/2.4.6/_/_/package/ed03dd185916c6a62cfea9667c4eb5fa400961da/bin"]
-[ENV_automake]
-ACLOCAL=["/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/bin/aclocal"]
-AUTOMAKE=/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/bin/automake
-AUTOMAKE_DATADIR=/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res
-AUTOMAKE_LIBDIR=/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res/automake-1.16
-AUTOMAKE_PERLLIBDIR=/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/res/automake-1.16
-PATH=["/home/maarten/.conan/data/automake/1.16.5/_/_/package/258f6f05ca54813b3d7180161753df7f9ccf7e1d/bin"]
-[ENV_autoconf]
-AC_MACRODIR=/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin/share/autoconf
-AUTOCONF=/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin/autoconf
-AUTOHEADER=/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin/autoheader
-AUTOM4TE=/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin/autom4te
-AUTOM4TE_PERLLIBDIR=/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin/share/autoconf
-AUTORECONF=/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin/autoreconf
-PATH=["/home/maarten/.conan/data/autoconf/2.71/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/bin"]
-[ENV_m4]
-M4=/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c/bin/m4
-PATH=["/home/maarten/.conan/data/m4/1.4.19/_/_/package/24647d9fe8ec489125dfbae4b3ebefaf7581674c/bin"]
\ No newline at end of file
diff --git a/conanfile.py b/conanfile.py
deleted file mode 100644
index f27f6471..00000000
--- a/conanfile.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from conans import ConanFile
-
-
-class Sdl2Ttf(ConanFile):
- def build_requirements(self):
- self.build_requires("autoconf/2.71")
- self.build_requires("libtool/2.4.6")
-
- def build(self):
- self.run("./autogen.sh")
diff --git a/conaninfo.txt b/conaninfo.txt
deleted file mode 100644
index bb95071f..00000000
--- a/conaninfo.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-[settings]
-
-
-[requires]
-
-
-[options]
-
-
-[full_settings]
-
-
-[full_requires]
-
-
-[full_options]
-
-
-[recipe_hash]
-
-
-[env]
- CC=/usr/bin/gcc
- CXX=/usr/bin/g++
diff --git a/graph_info.json b/graph_info.json
deleted file mode 100644
index bd6da11f..00000000
--- a/graph_info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "options": [],
- "root": {
- "name": null,
- "version": null,
- "user": null,
- "channel": null
- }
-}
\ No newline at end of file