diff --git a/main.cpp b/main.cpp index 38ab73d..e5d7276 100644 --- a/main.cpp +++ b/main.cpp @@ -12,12 +12,7 @@ #include void ImGui_setup(sf::RenderWindow &window) { - int res = ImGui::SFML::Init(window); - if(res == 1) { - fmt::print("ImGui returned result {}\n", res); - } else { - fmt::print("ImGui returned an error code={}\n", res); - } + ImGui::SFML::Init(window); } void ImGui_update(sf::RenderWindow &window, sf::Clock &deltaClock, sf::Time &tick) { diff --git a/scripts/reset_build.ps1 b/scripts/reset_build.ps1 index d3a0ea3..1405a09 100644 --- a/scripts/reset_build.ps1 +++ b/scripts/reset_build.ps1 @@ -3,16 +3,5 @@ rm -recurse -force .\subprojects\,.\builddir\ mkdir subprojects mv .\packagecache .\subprojects\ mkdir builddir -meson wrap install flac -meson wrap install freetype2 -meson wrap install imgui-sfml -meson wrap install imgui -meson wrap install libpng -meson wrap install ogg -meson wrap install openal-soft -meson wrap install sfml -meson wrap install vorbis -meson wrap install zlib -meson wrap install fmt -meson wrap install box2d +cp wraps\*.wrap subprojects meson setup -Ddefault_library=static builddir diff --git a/scripts/reset_build.sh b/scripts/reset_build.sh index 5f20ffc..22ff10a 100755 --- a/scripts/reset_build.sh +++ b/scripts/reset_build.sh @@ -6,16 +6,5 @@ rm -rf ./subprojects ./builddir mkdir subprojects mv ./packagecache ./subprojects mkdir builddir -meson wrap install flac -meson wrap install freetype2 -meson wrap install imgui-sfml -meson wrap install imgui -meson wrap install libpng -meson wrap install ogg -meson wrap install openal-soft -meson wrap install sfml -meson wrap install vorbis -meson wrap install zlib -meson wrap install fmt -meson wrap install box2d +cp wraps/*.wrap subprojects/ meson setup builddir diff --git a/scripts/setup.ps1 b/scripts/setup.ps1 index aeefa38..962d0af 100644 --- a/scripts/setup.ps1 +++ b/scripts/setup.ps1 @@ -1,15 +1,4 @@ mkdir builddir mkdir subprojects -meson wrap install flac -meson wrap install freetype2 -meson wrap install imgui-sfml -meson wrap install imgui -meson wrap install libpng -meson wrap install ogg -meson wrap install openal-soft -meson wrap install sfml -meson wrap install vorbis -meson wrap install zlib -meson wrap install box2d -meson wrap install fmt +cp wrap/*.wrap subprojects meson setup -Ddefault_library=static builddir diff --git a/scripts/setup.sh b/scripts/setup.sh index 36b1ea1..7881736 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -3,16 +3,5 @@ set -ex mkdir subprojects mkdir builddir -meson wrap install flac -meson wrap install freetype2 -meson wrap install imgui-sfml -meson wrap install imgui -meson wrap install libpng -meson wrap install ogg -meson wrap install openal-soft -meson wrap install sfml -meson wrap install vorbis -meson wrap install zlib -meson wrap install fmt -meson wrap install box2d +cp wraps/*.wrap subprojects/ meson setup builddir diff --git a/wraps/box2d.wrap b/wraps/box2d.wrap new file mode 100644 index 0000000..3440804 --- /dev/null +++ b/wraps/box2d.wrap @@ -0,0 +1,12 @@ +[wrap-file] +directory = box2d-2.4.1 +source_url = https://github.com/erincatto/box2d/archive/v2.4.1/box2d-2.4.1.tar.gz +source_filename = box2d-2.4.1.tar.gz +source_hash = d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2 +patch_filename = box2d_2.4.1-3_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/box2d_2.4.1-3/get_patch +patch_hash = 040bc127d1a8a9cd649cd53f15e8a9fa71d5cc70eaa36bb77d057ba7017cf3c8 +wrapdb_version = 2.4.1-3 + +[provide] +box2d = box2d_dep diff --git a/wraps/flac.wrap b/wraps/flac.wrap new file mode 100644 index 0000000..ee36479 --- /dev/null +++ b/wraps/flac.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = flac-1.4.3 +source_url = https://github.com/xiph/flac/releases/download/1.4.3/flac-1.4.3.tar.xz +source_filename = flac-1.4.3.tar.xz +source_hash = 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70 +patch_filename = flac_1.4.3-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/flac_1.4.3-2/get_patch +patch_hash = 3eace1bd0769d3e0d4ff099960160766a5185d391c8f583293b087a1f96c2a9c +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/flac_1.4.3-2/flac-1.4.3.tar.xz +wrapdb_version = 1.4.3-2 + +[provide] +flac = flac_dep diff --git a/wraps/fmt.wrap b/wraps/fmt.wrap new file mode 100644 index 0000000..42b6159 --- /dev/null +++ b/wraps/fmt.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = fmt-11.0.1 +source_url = https://github.com/fmtlib/fmt/archive/11.0.1.tar.gz +source_filename = fmt-11.0.1.tar.gz +source_hash = 7d009f7f89ac84c0a83f79ed602463d092fbf66763766a907c97fd02b100f5e9 +patch_filename = fmt_11.0.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.1-1/get_patch +patch_hash = 0a8b93d1ee6d84a82d3872a9bfb4c3977d8a53f7f484d42d1f7ed63ed496d549 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.1-1/fmt-11.0.1.tar.gz +wrapdb_version = 11.0.1-1 + +[provide] +fmt = fmt_dep diff --git a/wraps/freetype2.wrap b/wraps/freetype2.wrap new file mode 100644 index 0000000..acad6f4 --- /dev/null +++ b/wraps/freetype2.wrap @@ -0,0 +1,11 @@ +[wrap-file] +directory = freetype-2.13.3 +source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.3-1/freetype-2.13.3.tar.xz +source_filename = freetype-2.13.3.tar.xz +source_hash = 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289 +wrapdb_version = 2.13.3-1 + +[provide] +freetype2 = freetype_dep +freetype = freetype_dep diff --git a/wraps/imgui-sfml.wrap b/wraps/imgui-sfml.wrap new file mode 100644 index 0000000..b385b05 --- /dev/null +++ b/wraps/imgui-sfml.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = imgui-sfml-2.6 +source_url = https://github.com/eliasdaler/imgui-sfml/archive/refs/tags/v2.6.tar.gz +source_filename = v2.6.tar.gz +source_hash = b1195ca1210dd46c8049cfc8cae7f31cd34f1591da7de1c56297b277ac9c5cc0 +patch_filename = imgui-sfml_2.6-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/imgui-sfml_2.6-1/get_patch +patch_hash = a804978cf015af2db13476eefd2ed16e64c2c5142eb4e4a93be5f19e0c7cbdbb +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/imgui-sfml_2.6-1/v2.6.tar.gz +wrapdb_version = 2.6-1 + +[provide] +imgui-sfml = imgui_sfml_dep diff --git a/wraps/imgui.wrap b/wraps/imgui.wrap new file mode 100644 index 0000000..da941e4 --- /dev/null +++ b/wraps/imgui.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = imgui-1.89.9 +source_url = https://github.com/ocornut/imgui/archive/refs/tags/v1.89.9.tar.gz +source_filename = imgui-1.89.9.tar.gz +source_hash = 1acc27a778b71d859878121a3f7b287cd81c29d720893d2b2bf74455bf9d52d6 +patch_filename = imgui_1.89.9-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/imgui_1.89.9-2/get_patch +patch_hash = 3b99f0f7e039b05926e7a5c45f383210d5d933276701368e4885ea691d3e68e6 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/imgui_1.89.9-2/imgui-1.89.9.tar.gz +wrapdb_version = 1.89.9-2 + +[provide] +imgui = imgui_dep diff --git a/wraps/libpng.wrap b/wraps/libpng.wrap new file mode 100644 index 0000000..2c5f9c6 --- /dev/null +++ b/wraps/libpng.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = libpng-1.6.43 +source_url = https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz +source_filename = libpng-1.6.43.tar.gz +source_hash = fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a +patch_filename = libpng_1.6.43-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.43-2/get_patch +patch_hash = 49951297edf03e81d925ab03726555f09994ad1ed78fb539a269216430eef3da +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.43-2/libpng-1.6.43.tar.gz +wrapdb_version = 1.6.43-2 + +[provide] +libpng = libpng_dep diff --git a/wraps/ogg.wrap b/wraps/ogg.wrap new file mode 100644 index 0000000..e7f23eb --- /dev/null +++ b/wraps/ogg.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = libogg-1.3.5 +source_url = https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz +source_filename = libogg-1.3.5.tar.xz +source_hash = c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705 +patch_filename = ogg_1.3.5-6_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/ogg_1.3.5-6/get_patch +patch_hash = 8be6dcd5f93bbf9c0b9c8ec1fa29810226a60f846383074ca05b313a248e78b2 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/ogg_1.3.5-6/libogg-1.3.5.tar.xz +wrapdb_version = 1.3.5-6 + +[provide] +ogg = libogg_dep diff --git a/wraps/openal-soft.wrap b/wraps/openal-soft.wrap new file mode 100644 index 0000000..4518c52 --- /dev/null +++ b/wraps/openal-soft.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = openal-soft-1.23.1 +source_url = https://github.com/kcat/openal-soft/archive/refs/tags/1.23.1.tar.gz +source_filename = openal-soft-1.23.1.tar.gz +source_hash = dfddf3a1f61059853c625b7bb03de8433b455f2f79f89548cbcbd5edca3d4a4a +patch_filename = openal-soft_1.23.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/openal-soft_1.23.1-1/get_patch +patch_hash = dec7316b7258ebf47e6e0436fb4be39297d86d2aa8c098903055dd85c7144501 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/openal-soft_1.23.1-1/openal-soft-1.23.1.tar.gz +wrapdb_version = 1.23.1-1 + +[provide] +openal = openal_dep diff --git a/wraps/sfml.wrap b/wraps/sfml.wrap new file mode 100644 index 0000000..1d84525 --- /dev/null +++ b/wraps/sfml.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = SFML-2.6.1 +source_url = https://github.com/SFML/SFML/archive/refs/tags/2.6.1.tar.gz +source_filename = 2.6.1.tar.gz +source_hash = 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d +patch_filename = sfml_2.6.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/sfml_2.6.1-1/get_patch +patch_hash = 10367d927ec489dc575491de0059945a63ba08eef3f6fc146e6ba339176c9f18 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sfml_2.6.1-1/2.6.1.tar.gz +wrapdb_version = 2.6.1-1 + +[provide] +sfml = sfml_dep diff --git a/wraps/vorbis.wrap b/wraps/vorbis.wrap new file mode 100644 index 0000000..7425c11 --- /dev/null +++ b/wraps/vorbis.wrap @@ -0,0 +1,14 @@ +[wrap-file] +directory = libvorbis-1.3.7 +source_url = https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz +source_filename = libvorbis-1.3.7.tar.xz +source_hash = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b +patch_filename = vorbis_1.3.7-4_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/vorbis_1.3.7-4/get_patch +patch_hash = 979e22b24b16c927040700dfd8319cd6ba29bf52a14dbc66b1cb4ea60504f14a +wrapdb_version = 1.3.7-4 + +[provide] +vorbis = vorbis_dep +vorbisfile = vorbisfile_dep +vorbisenc = vorbisenc_dep diff --git a/wraps/zlib.wrap b/wraps/zlib.wrap new file mode 100644 index 0000000..aa14de1 --- /dev/null +++ b/wraps/zlib.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = zlib-1.3.1 +source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz +source_filename = zlib-1.3.1.tar.gz +source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 +patch_filename = zlib_1.3.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch +patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095 +wrapdb_version = 1.3.1-1 + +[provide] +zlib = zlib_dep