mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-04-21 21:52:04 +02:00
Remove libsigc++, use sigslot instead
This commit is contained in:
Struma
Roza
parent
2177823ed5
commit
baaa162e2c
21 changed files with 77 additions and 123 deletions
|
|
@ -33,20 +33,20 @@ Firstly, each platform has a set of tools and libraries that must be installed p
|
|||
+ **macOS (through Homebrew)**
|
||||
|
||||
```sh
|
||||
brew install libtool mm-common cmake automake autoconf pkg-config
|
||||
brew install libtool cmake automake autoconf pkg-config
|
||||
```
|
||||
|
||||
+ **Windows (MSYS 64-Bit)**
|
||||
|
||||
```sh
|
||||
# Assuming 64-bit
|
||||
pacman -S git ruby base-devel mingw-w64-x86_64-cmake mingw-w64-x86_64-meson mingw-w64-x86_64-gcc mingw-w64-x86_64-libsigc++
|
||||
pacman -S git ruby base-devel mingw-w64-x86_64-cmake mingw-w64-x86_64-meson mingw-w64-x86_64-gcc
|
||||
```
|
||||
|
||||
+ **Linux (Ubuntu/Debian)**
|
||||
|
||||
```sh
|
||||
sudo apt install git build-essential cmake meson autoconf automake mm-common libtool pkg-config ruby bison zlib1g-dev xorg-dev lib32z1 libasound2-dev libpulse-dev
|
||||
sudo apt install git build-essential cmake meson autoconf automake libtool pkg-config ruby bison zlib1g-dev xorg-dev lib32z1 libasound2-dev libpulse-dev
|
||||
```
|
||||
|
||||
If Meson complains about not being able to find OpenGL, you also need `libgl1-mesa-dev`. After having all the prerequisites, go to your platform's respective folder and run `make` (or `setup.command` on macOS).
|
||||
|
|
|
|||
|
|
@ -82,20 +82,6 @@ $(DOWNLOADS)/ogg/configure: $(DOWNLOADS)/ogg/autogen.sh
|
|||
$(DOWNLOADS)/ogg/autogen.sh:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/ogg $(DOWNLOADS)/ogg
|
||||
|
||||
# sigc++-2
|
||||
sigcxx: init_dirs $(LIBDIR)/libsigc-2.0.a
|
||||
|
||||
$(LIBDIR)/libsigc-2.0.a: $(DOWNLOADS)/sigcxx/Makefile
|
||||
cd $(DOWNLOADS)/sigcxx; \
|
||||
$(CONFIGURE_ENV) make; $(CONFIGURE_ENV) make install
|
||||
|
||||
$(DOWNLOADS)/sigcxx/Makefile: $(DOWNLOADS)/sigcxx/autogen.sh
|
||||
cd $(DOWNLOADS)/sigcxx; \
|
||||
$(AUTOGEN) --enable-static=yes --enable-shared=no
|
||||
|
||||
$(DOWNLOADS)/sigcxx/autogen.sh:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/libsigcplusplus -b libsigc++-2-10 $(DOWNLOADS)/sigcxx
|
||||
|
||||
# uchardet
|
||||
uchardet: init_dirs $(LIBDIR)/libuchardet.a
|
||||
|
||||
|
|
@ -329,5 +315,5 @@ powerwash: clean-downloads
|
|||
clean-downloads:
|
||||
-rm -rf downloads
|
||||
|
||||
deps-core: libvorbis sigcxx pixman libpng libjpeg physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth
|
||||
deps-core: libvorbis pixman libpng libjpeg physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth
|
||||
everything: deps-core ruby
|
||||
|
|
@ -82,20 +82,6 @@ $(DOWNLOADS)/ogg/configure: $(DOWNLOADS)/ogg/autogen.sh
|
|||
$(DOWNLOADS)/ogg/autogen.sh:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/ogg $(DOWNLOADS)/ogg
|
||||
|
||||
# sigc++-2
|
||||
sigcxx: init_dirs $(LIBDIR)/libsigc-2.0.a
|
||||
|
||||
$(LIBDIR)/libsigc-2.0.a: $(DOWNLOADS)/sigcxx/Makefile
|
||||
cd $(DOWNLOADS)/sigcxx; \
|
||||
$(CONFIGURE_ENV) make; $(CONFIGURE_ENV) make install
|
||||
|
||||
$(DOWNLOADS)/sigcxx/Makefile: $(DOWNLOADS)/sigcxx/autogen.sh
|
||||
cd $(DOWNLOADS)/sigcxx; \
|
||||
$(AUTOGEN) --enable-static=yes --enable-shared=no
|
||||
|
||||
$(DOWNLOADS)/sigcxx/autogen.sh:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/libsigcplusplus -b libsigc++-2-10 $(DOWNLOADS)/sigcxx
|
||||
|
||||
# uchardet
|
||||
uchardet: init_dirs $(LIBDIR)/libuchardet.a
|
||||
|
||||
|
|
@ -326,5 +312,5 @@ clean-downloads:
|
|||
clean-compiled:
|
||||
-rm -rf build-$(SDK)-$(ARCH)
|
||||
|
||||
deps-core: libvorbis sigcxx pixman libpng libjpeg physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl
|
||||
deps-core: libvorbis pixman libpng libjpeg physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl
|
||||
everything: deps-core ruby
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ armfiles.length.times{|i|
|
|||
src_includes = BUILD_ARM.sub(/lib$/, "include")
|
||||
dst = DESTINATION.sub(/lib$/, "include")
|
||||
FileUtils.ln_s(src_includes, dst) if !Dir.exists?(dst)
|
||||
FileUtils.ln_s(File.join(BUILD_ARM, "sigc++-2.0"), DESTINATION)
|
||||
|
||||
rb = File.join(BUILD_ARM, "ruby")
|
||||
FileUtils.ln_s(rb, DESTINATION) if Dir.exists?(rb)
|
||||
|
|
@ -200,7 +200,6 @@
|
|||
3B1C23CF25A19C600075EF5D /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E6256879FC0006849F /* libvorbis.a */; };
|
||||
3B1C23D025A19C600075EF5D /* libSDL2_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FA256879FE0006849F /* libSDL2_test.a */; };
|
||||
3B1C23D225A19C600075EF5D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B47A256534BA003DAD8A /* IOKit.framework */; };
|
||||
3B1C23D325A19C600075EF5D /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B426F76256BA847009EA00F /* libsigc-2.0.a */; };
|
||||
3B1C23D425A19C600075EF5D /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081552568D3A60006849F /* Carbon.framework */; };
|
||||
3B1C23D625A19C600075EF5D /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081542568D3A60006849F /* Metal.framework */; };
|
||||
3B1C23D725A19C600075EF5D /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081572568D3A60006849F /* ForceFeedback.framework */; };
|
||||
|
|
@ -240,7 +239,6 @@
|
|||
3B3F7D2B25B1A73A00EA5F1C /* SettingsMenuController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B3F7D2925B1A73A00EA5F1C /* SettingsMenuController.mm */; };
|
||||
3B3F7D2C25B1A73A00EA5F1C /* SettingsMenuController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B3F7D2925B1A73A00EA5F1C /* SettingsMenuController.mm */; };
|
||||
3B3F7D2D25B1A73A00EA5F1C /* SettingsMenuController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B3F7D2925B1A73A00EA5F1C /* SettingsMenuController.mm */; };
|
||||
3B426F77256BA847009EA00F /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B426F76256BA847009EA00F /* libsigc-2.0.a */; };
|
||||
3B480E9F25DCD174001686B4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
|
||||
3B480EA025DCD175001686B4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
|
||||
3B480EA125DCD176001686B4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
|
||||
|
|
@ -390,7 +388,6 @@
|
|||
3BC65D642584EED10063AFF1 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D542584EED10063AFF1 /* libvorbisfile.a */; };
|
||||
3BC65D652584EED10063AFF1 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D552584EED10063AFF1 /* libSDL2.a */; };
|
||||
3BC65D662584EED10063AFF1 /* libopenal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D562584EED10063AFF1 /* libopenal.a */; };
|
||||
3BC65D672584EED10063AFF1 /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D572584EED10063AFF1 /* libsigc-2.0.a */; };
|
||||
3BC65D682584EED10063AFF1 /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D582584EED10063AFF1 /* libturbojpeg.a */; };
|
||||
3BC65D692584EED10063AFF1 /* libpng16.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D592584EED10063AFF1 /* libpng16.a */; };
|
||||
3BC65D8E2584F3AD0063AFF1 /* tilemapvx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B10ED7D2568E95D00372D13 /* tilemapvx.cpp */; };
|
||||
|
|
@ -480,7 +477,6 @@
|
|||
3BC65E252584F4290063AFF1 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D852584F3780063AFF1 /* libvorbis.a */; };
|
||||
3BC65E262584F4290063AFF1 /* libpng16.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D872584F3780063AFF1 /* libpng16.a */; };
|
||||
3BC65E282584F4290063AFF1 /* libSDL2main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D892584F3910063AFF1 /* libSDL2main.a */; };
|
||||
3BC65E2A2584F4290063AFF1 /* libsigc-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D802584F3780063AFF1 /* libsigc-2.0.a */; };
|
||||
3BC65E2B2584F4290063AFF1 /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D7B2584F3780063AFF1 /* libphysfs.a */; };
|
||||
3BC65E2C2584F4290063AFF1 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D7A2584F3780063AFF1 /* libvorbisenc.a */; };
|
||||
3BC65E2D2584F4290063AFF1 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D822584F3780063AFF1 /* libogg.a */; };
|
||||
|
|
@ -952,7 +948,6 @@
|
|||
3B426F6E256B8AC0009EA00F /* filesystem.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = filesystem.hpp; sourceTree = "<group>"; };
|
||||
3B426F6F256B8AC0009EA00F /* fs_impl.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = fs_impl.hpp; sourceTree = "<group>"; };
|
||||
3B426F70256B8AC0009EA00F /* fs_std_fwd.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = fs_std_fwd.hpp; sourceTree = "<group>"; };
|
||||
3B426F76256BA847009EA00F /* libsigc-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-2.0.a"; path = "Dependencies/build-macosx-x86_64/lib/libsigc-2.0.a"; sourceTree = "<group>"; };
|
||||
3B480E9325DCBDD6001686B4 /* sdl_codes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sdl_codes.h; path = views/sdl_codes.h; sourceTree = "<group>"; };
|
||||
3B480E9E25DCD16D001686B4 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; };
|
||||
3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfluidsynth.dylib; path = Dependencies/Frameworks/libfluidsynth.dylib; sourceTree = "<group>"; };
|
||||
|
|
@ -1003,14 +998,12 @@
|
|||
3BC65D542584EED10063AFF1 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-macosx-arm64/lib/libvorbisfile.a"; sourceTree = "<group>"; };
|
||||
3BC65D552584EED10063AFF1 /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = "Dependencies/build-macosx-arm64/lib/libSDL2.a"; sourceTree = "<group>"; };
|
||||
3BC65D562584EED10063AFF1 /* libopenal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenal.a; path = "Dependencies/build-macosx-arm64/lib/libopenal.a"; sourceTree = "<group>"; };
|
||||
3BC65D572584EED10063AFF1 /* libsigc-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-2.0.a"; path = "Dependencies/build-macosx-arm64/lib/libsigc-2.0.a"; sourceTree = "<group>"; };
|
||||
3BC65D582584EED10063AFF1 /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-macosx-arm64/lib/libturbojpeg.a"; sourceTree = "<group>"; };
|
||||
3BC65D592584EED10063AFF1 /* libpng16.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng16.a; path = "Dependencies/build-macosx-arm64/lib/libpng16.a"; sourceTree = "<group>"; };
|
||||
3BC65D7A2584F3780063AFF1 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "Dependencies/build-macosx-universal/lib/libvorbisenc.a"; sourceTree = "<group>"; };
|
||||
3BC65D7B2584F3780063AFF1 /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "Dependencies/build-macosx-universal/lib/libphysfs.a"; sourceTree = "<group>"; };
|
||||
3BC65D7D2584F3780063AFF1 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-macosx-universal/lib/libfreetype.a"; sourceTree = "<group>"; };
|
||||
3BC65D7E2584F3780063AFF1 /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-macosx-universal/lib/libturbojpeg.a"; sourceTree = "<group>"; };
|
||||
3BC65D802584F3780063AFF1 /* libsigc-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsigc-2.0.a"; path = "Dependencies/build-macosx-universal/lib/libsigc-2.0.a"; sourceTree = "<group>"; };
|
||||
3BC65D812584F3780063AFF1 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-macosx-universal/lib/libvorbisfile.a"; sourceTree = "<group>"; };
|
||||
3BC65D822584F3780063AFF1 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-macosx-universal/lib/libogg.a"; sourceTree = "<group>"; };
|
||||
3BC65D832584F3780063AFF1 /* libSDL2_ttf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_ttf.a; path = "Dependencies/build-macosx-universal/lib/libSDL2_ttf.a"; sourceTree = "<group>"; };
|
||||
|
|
@ -1057,6 +1050,7 @@
|
|||
3BE081572568D3A60006849F /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = System/Library/Frameworks/ForceFeedback.framework; sourceTree = SDKROOT; };
|
||||
3BE081582568D3A60006849F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
|
||||
3BEA5D7125AC3CE300B6E359 /* libSDL2_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_image.a; path = "Dependencies/build-macosx-universal/lib/libSDL2_image.a"; sourceTree = "<group>"; };
|
||||
3BFABF53267787940024C7DD /* sigslot */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sigslot; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
|
|
@ -1091,7 +1085,6 @@
|
|||
3B1C23CF25A19C600075EF5D /* libvorbis.a in Frameworks */,
|
||||
3B1C23D025A19C600075EF5D /* libSDL2_test.a in Frameworks */,
|
||||
3B1C23D225A19C600075EF5D /* IOKit.framework in Frameworks */,
|
||||
3B1C23D325A19C600075EF5D /* libsigc-2.0.a in Frameworks */,
|
||||
3B1C23D425A19C600075EF5D /* Carbon.framework in Frameworks */,
|
||||
3B1C23D625A19C600075EF5D /* Metal.framework in Frameworks */,
|
||||
3B1C23D725A19C600075EF5D /* ForceFeedback.framework in Frameworks */,
|
||||
|
|
@ -1156,7 +1149,6 @@
|
|||
3BC65D612584EED10063AFF1 /* libogg.a in Frameworks */,
|
||||
3BC65D352584EDC60063AFF1 /* CoreFoundation.framework in Frameworks */,
|
||||
3BC65D362584EDC60063AFF1 /* libz.tbd in Frameworks */,
|
||||
3BC65D672584EED10063AFF1 /* libsigc-2.0.a in Frameworks */,
|
||||
3BC65D5F2584EED10063AFF1 /* libfreetype.a in Frameworks */,
|
||||
3BC65D372584EDC60063AFF1 /* libiconv.tbd in Frameworks */,
|
||||
3BC65D602584EED10063AFF1 /* libSDL2main.a in Frameworks */,
|
||||
|
|
@ -1186,7 +1178,6 @@
|
|||
3BC65DF52584F3AD0063AFF1 /* ForceFeedback.framework in Frameworks */,
|
||||
3BC65DF62584F3AD0063AFF1 /* CoreVideo.framework in Frameworks */,
|
||||
3BC65E232584F4290063AFF1 /* libfreetype.a in Frameworks */,
|
||||
3BC65E2A2584F4290063AFF1 /* libsigc-2.0.a in Frameworks */,
|
||||
3BC65DFA2584F3AD0063AFF1 /* CoreGraphics.framework in Frameworks */,
|
||||
3BEA5D7225AC3CE300B6E359 /* libSDL2_image.a in Frameworks */,
|
||||
3B522DCA259BFEE0003301C4 /* libcrypto.a in Frameworks */,
|
||||
|
|
@ -1231,7 +1222,6 @@
|
|||
3BE08104256879FE0006849F /* libvorbis.a in Frameworks */,
|
||||
3BE08118256879FE0006849F /* libSDL2_test.a in Frameworks */,
|
||||
3BD2B6E72565AEC0003DAD8A /* IOKit.framework in Frameworks */,
|
||||
3B426F77256BA847009EA00F /* libsigc-2.0.a in Frameworks */,
|
||||
3B10EC5D2568D40C00372D13 /* Carbon.framework in Frameworks */,
|
||||
3B10EC5F2568D40C00372D13 /* Metal.framework in Frameworks */,
|
||||
3B10EC602568D40C00372D13 /* ForceFeedback.framework in Frameworks */,
|
||||
|
|
@ -1338,6 +1328,7 @@
|
|||
3B10ED392568E95D00372D13 /* util */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3BFABF53267787940024C7DD /* sigslot */,
|
||||
3B10ED3A2568E95D00372D13 /* intrulist.h */,
|
||||
3B10ED3B2568E95D00372D13 /* sdl-util.h */,
|
||||
3B10ED3C2568E95D00372D13 /* boost-hash.h */,
|
||||
|
|
@ -1669,7 +1660,6 @@
|
|||
3BC65D532584EED10063AFF1 /* libSDL2_ttf.a */,
|
||||
3BC65D552584EED10063AFF1 /* libSDL2.a */,
|
||||
3BC65D502584EED10063AFF1 /* libSDL2main.a */,
|
||||
3BC65D572584EED10063AFF1 /* libsigc-2.0.a */,
|
||||
3BC65D582584EED10063AFF1 /* libturbojpeg.a */,
|
||||
3BC65D4A2584EED10063AFF1 /* libvorbis.a */,
|
||||
3BC65D4D2584EED10063AFF1 /* libvorbisenc.a */,
|
||||
|
|
@ -1698,7 +1688,6 @@
|
|||
3BC65D832584F3780063AFF1 /* libSDL2_ttf.a */,
|
||||
3BC65D862584F3780063AFF1 /* libSDL2.a */,
|
||||
3BC65D892584F3910063AFF1 /* libSDL2main.a */,
|
||||
3BC65D802584F3780063AFF1 /* libsigc-2.0.a */,
|
||||
3BC65D7E2584F3780063AFF1 /* libturbojpeg.a */,
|
||||
3BC65D852584F3780063AFF1 /* libvorbis.a */,
|
||||
3BC65D7A2584F3780063AFF1 /* libvorbisenc.a */,
|
||||
|
|
@ -1816,7 +1805,6 @@
|
|||
3BE080FF256879FE0006849F /* libphysfs.a */,
|
||||
3B1C230A25A144A10075EF5D /* libruby.3.0.dylib */,
|
||||
3BE080E9256879FC0006849F /* libpixman-1.a */,
|
||||
3B426F76256BA847009EA00F /* libsigc-2.0.a */,
|
||||
3BE080F0256879FD0006849F /* libSDL2_image.a */,
|
||||
3B97F77525E6182100A569B5 /* libSDL2_sound.a */,
|
||||
3BE080FA256879FE0006849F /* libSDL2_test.a */,
|
||||
|
|
@ -3030,7 +3018,6 @@
|
|||
"$(DEPENDENCY_SEARCH_PATH)/include",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/lib/**",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/SDL2",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/pixman-1",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/arm64-darwin",
|
||||
|
|
@ -3114,7 +3101,6 @@
|
|||
"$(DEPENDENCY_SEARCH_PATH)/include",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/lib/**",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/SDL2",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/pixman-1",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/arm64-darwin",
|
||||
|
|
@ -3287,7 +3273,7 @@
|
|||
baseConfigurationReference = 3B1C231E25A15FB20075EF5D /* mkxp.xcconfig */;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD)";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
|
|
@ -3330,7 +3316,6 @@
|
|||
"$(DEPENDENCY_SEARCH_PATH)/include",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/lib/**",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/SDL2",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/pixman-1",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/$(BUILD_ARCH)-darwin",
|
||||
|
|
@ -3358,7 +3343,7 @@
|
|||
baseConfigurationReference = 3B1C231E25A15FB20075EF5D /* mkxp.xcconfig */;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD)";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
|
|
@ -3400,7 +3385,6 @@
|
|||
"$(DEPENDENCY_SEARCH_PATH)/include",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/lib/**",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/SDL2",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/sigc++-2.0",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/pixman-1",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)",
|
||||
"$(DEPENDENCY_SEARCH_PATH)/include/ruby-$(MRI_VERSION)/$(BUILD_ARCH)-darwin",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
project('mkxp-z', 'c', 'cpp', version: '2.2.1', meson_version: '>=0.51.0', default_options: ['cpp_std=c++11', 'buildtype=release'])
|
||||
project('mkxp-z', 'c', 'cpp', version: '2.2.1', meson_version: '>=0.51.0', default_options: ['cpp_std=c++14', 'buildtype=release'])
|
||||
|
||||
host_system = host_machine.system()
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
#include "debugwriter.h"
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
|
|
@ -213,7 +213,7 @@ struct BitmapPrivate
|
|||
}
|
||||
} animation;
|
||||
|
||||
sigc::connection prepareCon;
|
||||
sigslot::connection prepareCon;
|
||||
|
||||
TEXFBO gl;
|
||||
|
||||
|
|
@ -256,7 +256,7 @@ struct BitmapPrivate
|
|||
animation.fps = 0;
|
||||
animation.lastFrame = 0;
|
||||
|
||||
prepareCon = shState->prepareDraw.connect(sigc::mem_fun(this, &BitmapPrivate::prepare));
|
||||
prepareCon = shState->prepareDraw.connect(&BitmapPrivate::prepare, this);
|
||||
|
||||
font = &shState->defaultFont();
|
||||
pixman_region_init(&tainted);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "etc-internal.h"
|
||||
#include "etc.h"
|
||||
|
||||
#include <sigc++/signal.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
class Font;
|
||||
class ShaderBase;
|
||||
|
|
@ -155,7 +155,7 @@ public:
|
|||
/* Adds 'rect' to tainted area */
|
||||
void taintArea(const IntRect &rect);
|
||||
|
||||
sigc::signal<void> modified;
|
||||
sigslot::signal<> modified;
|
||||
|
||||
static int maxSize();
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "shader.h"
|
||||
#include "glstate.h"
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
static float fwrap(float value, float range)
|
||||
{
|
||||
|
|
@ -62,7 +62,7 @@ struct PlanePrivate
|
|||
|
||||
EtcTemps tmp;
|
||||
|
||||
sigc::connection prepareCon;
|
||||
sigslot::connection prepareCon;
|
||||
|
||||
PlanePrivate()
|
||||
: bitmap(0),
|
||||
|
|
@ -75,7 +75,7 @@ struct PlanePrivate
|
|||
quadSourceDirty(false)
|
||||
{
|
||||
prepareCon = shState->prepareDraw.connect
|
||||
(sigc::mem_fun(this, &PlanePrivate::prepare));
|
||||
(&PlanePrivate::prepare, this);
|
||||
|
||||
qArray.resize(1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include <SDL_rect.h>
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
struct SpritePrivate
|
||||
{
|
||||
|
|
@ -51,7 +51,7 @@ struct SpritePrivate
|
|||
Transform trans;
|
||||
|
||||
Rect *srcRect;
|
||||
sigc::connection srcRectCon;
|
||||
sigslot::connection srcRectCon;
|
||||
|
||||
bool mirrored;
|
||||
int bushDepth;
|
||||
|
|
@ -86,7 +86,7 @@ struct SpritePrivate
|
|||
|
||||
EtcTemps tmp;
|
||||
|
||||
sigc::connection prepareCon;
|
||||
sigslot::connection prepareCon;
|
||||
|
||||
SpritePrivate()
|
||||
: bitmap(0),
|
||||
|
|
@ -107,7 +107,7 @@ struct SpritePrivate
|
|||
updateSrcRectCon();
|
||||
|
||||
prepareCon = shState->prepareDraw.connect
|
||||
(sigc::mem_fun(this, &SpritePrivate::prepare));
|
||||
(&SpritePrivate::prepare, this);
|
||||
|
||||
wave.amp = 0;
|
||||
wave.length = 180;
|
||||
|
|
@ -162,7 +162,7 @@ struct SpritePrivate
|
|||
srcRectCon.disconnect();
|
||||
/* Create new one */
|
||||
srcRectCon = srcRect->valueChanged.connect
|
||||
(sigc::mem_fun(this, &SpritePrivate::onSrcRectChange));
|
||||
(&SpritePrivate::onSrcRectChange, this);
|
||||
}
|
||||
|
||||
void updateVisibility()
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#include <assert.h>
|
||||
#include <vector>
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
static inline int
|
||||
wrap(int value, int range)
|
||||
|
|
@ -148,8 +148,9 @@ struct FlashMap
|
|||
if (!data)
|
||||
return;
|
||||
|
||||
dataCon = data->modified.connect
|
||||
(sigc::mem_fun(this, &FlashMap::setDirty));
|
||||
|
||||
|
||||
dataCon = data->modified.connect(&FlashMap::setDirty, this);
|
||||
}
|
||||
|
||||
void setViewport(const IntRect &value)
|
||||
|
|
@ -266,7 +267,7 @@ private:
|
|||
bool dirty;
|
||||
|
||||
Table *data;
|
||||
sigc::connection dataCon;
|
||||
sigslot::connection dataCon;
|
||||
|
||||
IntRect viewp;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#include "tileatlas.h"
|
||||
#include "tilemap-common.h"
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
|
@ -322,16 +322,16 @@ struct TilemapPrivate
|
|||
bool tilemapReady;
|
||||
|
||||
/* Change watches */
|
||||
sigc::connection tilesetCon;
|
||||
sigc::connection autotilesCon[autotileCount];
|
||||
sigc::connection mapDataCon;
|
||||
sigc::connection prioritiesCon;
|
||||
sigslot::connection tilesetCon;
|
||||
sigslot::connection autotilesCon[autotileCount];
|
||||
sigslot::connection mapDataCon;
|
||||
sigslot::connection prioritiesCon;
|
||||
|
||||
/* Dispose watches */
|
||||
sigc::connection autotilesDispCon[autotileCount];
|
||||
sigslot::connection autotilesDispCon[autotileCount];
|
||||
|
||||
/* Draw prepare call */
|
||||
sigc::connection prepareCon;
|
||||
sigslot::connection prepareCon;
|
||||
|
||||
NormValue opacity;
|
||||
BlendType blendType;
|
||||
|
|
@ -382,7 +382,7 @@ struct TilemapPrivate
|
|||
elem.zlayers[i] = new ZLayer(this, viewport);
|
||||
|
||||
prepareCon = shState->prepareDraw.connect
|
||||
(sigc::mem_fun(this, &TilemapPrivate::prepare));
|
||||
(&TilemapPrivate::prepare, this);
|
||||
|
||||
updateFlashMapViewport();
|
||||
}
|
||||
|
|
@ -1181,11 +1181,11 @@ void Tilemap::Autotiles::set(int i, Bitmap *bitmap)
|
|||
|
||||
p->autotilesCon[i].disconnect();
|
||||
p->autotilesCon[i] = bitmap->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapPrivate::invalidateAtlasContents));
|
||||
(&TilemapPrivate::invalidateAtlasContents, p);
|
||||
|
||||
p->autotilesDispCon[i].disconnect();
|
||||
p->autotilesDispCon[i] = bitmap->wasDisposed.connect
|
||||
(sigc::mem_fun(p, &TilemapPrivate::invalidateAtlasContents));
|
||||
(&TilemapPrivate::invalidateAtlasContents, p);
|
||||
|
||||
p->updateAutotileInfo();
|
||||
}
|
||||
|
|
@ -1266,7 +1266,7 @@ void Tilemap::setTileset(Bitmap *value)
|
|||
p->invalidateAtlasSize();
|
||||
p->tilesetCon.disconnect();
|
||||
p->tilesetCon = value->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapPrivate::invalidateAtlasSize));
|
||||
(&TilemapPrivate::invalidateAtlasSize, p);
|
||||
|
||||
p->updateAtlasInfo();
|
||||
}
|
||||
|
|
@ -1286,7 +1286,7 @@ void Tilemap::setMapData(Table *value)
|
|||
p->invalidateBuffers();
|
||||
p->mapDataCon.disconnect();
|
||||
p->mapDataCon = value->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapPrivate::invalidateBuffers));
|
||||
(&TilemapPrivate::invalidateBuffers, p);
|
||||
}
|
||||
|
||||
void Tilemap::setFlashData(Table *value)
|
||||
|
|
@ -1311,7 +1311,7 @@ void Tilemap::setPriorities(Table *value)
|
|||
p->invalidateBuffers();
|
||||
p->prioritiesCon.disconnect();
|
||||
p->prioritiesCon = value->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapPrivate::invalidateBuffers));
|
||||
(&TilemapPrivate::invalidateBuffers, p);
|
||||
}
|
||||
|
||||
void Tilemap::setVisible(bool value)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include "tilemap-common.h"
|
||||
|
||||
#include <vector>
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
/* Flash tiles pulsing opacity */
|
||||
static const uint8_t flashAlpha[] =
|
||||
|
|
@ -87,12 +87,12 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
|
|||
bool buffersDirty;
|
||||
bool mapViewportDirty;
|
||||
|
||||
sigc::connection mapDataCon;
|
||||
sigc::connection flagsCon;
|
||||
sigslot::connection mapDataCon;
|
||||
sigslot::connection flagsCon;
|
||||
|
||||
sigc::connection prepareCon;
|
||||
sigc::connection bmChangedCons[BM_COUNT];
|
||||
sigc::connection bmDisposedCons[BM_COUNT];
|
||||
sigslot::connection prepareCon;
|
||||
sigslot::connection bmChangedCons[BM_COUNT];
|
||||
sigslot::connection bmDisposedCons[BM_COUNT];
|
||||
|
||||
struct AboveLayer : public ViewportElement
|
||||
{
|
||||
|
|
@ -142,7 +142,7 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
|
|||
onGeometryChange(scene->getGeometry());
|
||||
|
||||
prepareCon = shState->prepareDraw.connect
|
||||
(sigc::mem_fun(this, &TilemapVXPrivate::prepare));
|
||||
(&TilemapVXPrivate::prepare, this);
|
||||
}
|
||||
|
||||
virtual ~TilemapVXPrivate()
|
||||
|
|
@ -383,11 +383,11 @@ void TilemapVX::BitmapArray::set(int i, Bitmap *bitmap)
|
|||
|
||||
p->bmChangedCons[i].disconnect();
|
||||
p->bmChangedCons[i] = bitmap->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapVXPrivate::invalidateAtlas));
|
||||
(&TilemapVXPrivate::invalidateAtlas, p);
|
||||
|
||||
p->bmDisposedCons[i].disconnect();
|
||||
p->bmDisposedCons[i] = bitmap->wasDisposed.connect
|
||||
(sigc::mem_fun(p, &TilemapVXPrivate::invalidateAtlas));
|
||||
(&TilemapVXPrivate::invalidateAtlas, p);
|
||||
}
|
||||
|
||||
Bitmap *TilemapVX::BitmapArray::get(int i) const
|
||||
|
|
@ -482,7 +482,7 @@ void TilemapVX::setMapData(Table *value)
|
|||
|
||||
p->mapDataCon.disconnect();
|
||||
p->mapDataCon = value->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapVXPrivate::invalidateBuffers));
|
||||
(&TilemapVXPrivate::invalidateBuffers, p);
|
||||
}
|
||||
|
||||
void TilemapVX::setFlashData(Table *value)
|
||||
|
|
@ -504,7 +504,7 @@ void TilemapVX::setFlags(Table *value)
|
|||
|
||||
p->flagsCon.disconnect();
|
||||
p->flagsCon = value->modified.connect
|
||||
(sigc::mem_fun(p, &TilemapVXPrivate::invalidateBuffers));
|
||||
(&TilemapVXPrivate::invalidateBuffers, p);
|
||||
}
|
||||
|
||||
void TilemapVX::setVisible(bool value)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include <SDL_rect.h>
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
struct ViewportPrivate
|
||||
{
|
||||
|
|
@ -38,7 +38,7 @@ struct ViewportPrivate
|
|||
Viewport *self;
|
||||
|
||||
Rect *rect;
|
||||
sigc::connection rectCon;
|
||||
sigslot::connection rectCon;
|
||||
|
||||
Color *color;
|
||||
Tone *tone;
|
||||
|
|
@ -75,7 +75,7 @@ struct ViewportPrivate
|
|||
{
|
||||
rectCon.disconnect();
|
||||
rectCon = rect->valueChanged.connect
|
||||
(sigc::mem_fun(this, &ViewportPrivate::onRectChange));
|
||||
(&ViewportPrivate::onRectChange, this);
|
||||
}
|
||||
|
||||
void recomputeOnScreen()
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "texpool.h"
|
||||
#include "glstate.h"
|
||||
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
template<typename T>
|
||||
struct Sides
|
||||
|
|
@ -177,7 +177,7 @@ struct WindowPrivate
|
|||
bool active;
|
||||
bool pause;
|
||||
|
||||
sigc::connection cursorRectCon;
|
||||
sigslot::connection cursorRectCon;
|
||||
|
||||
Vec2i sceneOffset;
|
||||
|
||||
|
|
@ -246,7 +246,7 @@ struct WindowPrivate
|
|||
|
||||
EtcTemps tmp;
|
||||
|
||||
sigc::connection prepareCon;
|
||||
sigslot::connection prepareCon;
|
||||
|
||||
WindowPrivate(Viewport *viewport = 0)
|
||||
: windowskin(0),
|
||||
|
|
@ -274,7 +274,7 @@ struct WindowPrivate
|
|||
pauseAniVert.count = 1;
|
||||
|
||||
prepareCon = shState->prepareDraw.connect
|
||||
(sigc::mem_fun(this, &WindowPrivate::prepare));
|
||||
(&WindowPrivate::prepare, this);
|
||||
}
|
||||
|
||||
~WindowPrivate()
|
||||
|
|
@ -293,7 +293,7 @@ struct WindowPrivate
|
|||
{
|
||||
cursorRectCon.disconnect();
|
||||
cursorRectCon = cursorRect->valueChanged.connect
|
||||
(sigc::mem_fun(this, &WindowPrivate::markControlVertDirty));
|
||||
(&WindowPrivate::markControlVertDirty, this);
|
||||
}
|
||||
|
||||
void buildBaseVert()
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <limits>
|
||||
#include <algorithm>
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
#define DEF_Z (rgssVer >= 3 ? 100 : 0)
|
||||
#define DEF_PADDING (rgssVer >= 3 ? 12 : 16)
|
||||
|
|
@ -179,9 +179,9 @@ struct WindowVXPrivate
|
|||
NormValue openness;
|
||||
Tone *tone;
|
||||
|
||||
sigc::connection cursorRectCon;
|
||||
sigc::connection toneCon;
|
||||
sigc::connection prepareCon;
|
||||
sigslot::connection cursorRectCon;
|
||||
sigslot::connection toneCon;
|
||||
sigslot::connection prepareCon;
|
||||
|
||||
EtcTemps tmp;
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ struct WindowVXPrivate
|
|||
}
|
||||
|
||||
prepareCon = shState->prepareDraw.connect
|
||||
(sigc::mem_fun(this, &WindowVXPrivate::prepare));
|
||||
(&WindowVXPrivate::prepare, this);
|
||||
|
||||
refreshCursorRectCon();
|
||||
refreshToneCon();
|
||||
|
|
@ -294,14 +294,14 @@ struct WindowVXPrivate
|
|||
{
|
||||
cursorRectCon.disconnect();
|
||||
cursorRectCon = cursorRect->valueChanged.connect
|
||||
(sigc::mem_fun(this, &WindowVXPrivate::invalidateCursorVert));
|
||||
(&WindowVXPrivate::invalidateCursorVert, this);
|
||||
}
|
||||
|
||||
void refreshToneCon()
|
||||
{
|
||||
toneCon.disconnect();
|
||||
toneCon = tone->valueChanged.connect
|
||||
(sigc::mem_fun(this, &WindowVXPrivate::invalidateBaseTex));
|
||||
(&WindowVXPrivate::invalidateBaseTex, this);
|
||||
}
|
||||
|
||||
void updateBaseTexSize()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef ETC_H
|
||||
#define ETC_H
|
||||
|
||||
#include <sigc++/signal.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
#include "serializable.h"
|
||||
#include "etc-internal.h"
|
||||
|
|
@ -143,7 +143,7 @@ struct Tone : public Serializable
|
|||
/* Normalized (-1.0 ~ 1.0) */
|
||||
Vec4 norm;
|
||||
|
||||
sigc::signal<void> valueChanged;
|
||||
sigslot::signal<> valueChanged;
|
||||
};
|
||||
|
||||
struct Rect : public Serializable
|
||||
|
|
@ -197,7 +197,7 @@ struct Rect : public Serializable
|
|||
int width;
|
||||
int height;
|
||||
|
||||
sigc::signal<void> valueChanged;
|
||||
sigslot::signal<> valueChanged;
|
||||
};
|
||||
|
||||
/* For internal use.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "serializable.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sigc++/signal.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
#include <vector>
|
||||
|
||||
class Table : public Serializable
|
||||
|
|
@ -62,7 +62,7 @@ public:
|
|||
return data[xs*ys*z + xs*y + x];
|
||||
}
|
||||
|
||||
sigc::signal<void> modified;
|
||||
sigslot::signal<> modified;
|
||||
|
||||
private:
|
||||
int xs, ys, zs;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
sigcxx = dependency('sigc++-2.0', version: '>=2.10.0', static: build_static)
|
||||
physfs = dependency('physfs', version: '>=2.1', static: build_static)
|
||||
openal = dependency('openal', static: build_static, method: 'pkg-config')
|
||||
vorbisfile = dependency('vorbisfile', static: build_static)
|
||||
|
|
@ -86,7 +85,7 @@ global_include_dirs += include_directories('.',
|
|||
'util'
|
||||
)
|
||||
|
||||
global_dependencies += [sigcxx, openal, zlib, bz2, sdl2, sdl_sound, pixman, physfs, vorbisfile, vorbis, ogg, sdl2_ttf, freetype, sdl2_image, png, jpeg]
|
||||
global_dependencies += [openal, zlib, bz2, sdl2, sdl_sound, pixman, physfs, vorbisfile, vorbis, ogg, sdl2_ttf, freetype, sdl2_image, png, jpeg]
|
||||
if host_system == 'windows'
|
||||
global_dependencies += compilers['cpp'].find_library('wsock32')
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef SHAREDSTATE_H
|
||||
#define SHAREDSTATE_H
|
||||
|
||||
#include <sigc++/signal.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
#define shState SharedState::instance
|
||||
#define glState shState->_glState()
|
||||
|
|
@ -81,7 +81,7 @@ struct SharedState
|
|||
Font &defaultFont() const;
|
||||
SharedMidiState &midiState() const;
|
||||
|
||||
sigc::signal<void> prepareDraw;
|
||||
sigslot::signal<> prepareDraw;
|
||||
|
||||
unsigned int genTimeStamp();
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
#include "graphics.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <sigc++/signal.h>
|
||||
#include <sigc++/connection.h>
|
||||
#include "sigslot/signal.hpp"
|
||||
|
||||
class Disposable
|
||||
{
|
||||
|
|
@ -61,7 +60,7 @@ public:
|
|||
return disposed;
|
||||
}
|
||||
|
||||
sigc::signal<void> wasDisposed;
|
||||
sigslot::signal<> wasDisposed;
|
||||
|
||||
protected:
|
||||
void guardDisposed() const
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue