Skip to content

Commit

Permalink
Add the Mac OS X workaround for SFML
Browse files Browse the repository at this point in the history
Fix PackageForOBS to embed SFML in the source archive
  • Loading branch information
victorlevasseur committed Dec 25, 2016
1 parent d7509cf commit 4e32b64
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Binaries/Packaging/PackageForOBS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ cd $CUR_DIR/opensuse-build-service/gdevelop
tar zxf gdevelop_$GD_VERSION.orig.tar.gz
echo "[OK]"

#We need to include ExtLibs/SFML.7z and ExtLibs/boost.7z because buildbot do not have access to internet
#We need to include ExtLibs/SFML.7z because the buildbot do not have access to internet
printf " Copying SFML archive... "
cp $GD_BASE_DIR/ExtLibs/SFML.7z gdevelop-$GD_VERSION/ExtLibs/
cp -rf $GD_BASE_DIR/ExtLibs/SFML gdevelop-$GD_VERSION/ExtLibs/
echo "[OK]"

#Recreate the tar.gz with the added sources
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/ExtLibs/SFML/src/SFML/Window/OSX/SFViewController.mm b/ExtLibs/SFML/src/SFML/Window/OSX/SFViewController.mm
index 7d736e3..113cacd 100644
--- a/ExtLibs/SFML/src/SFML/Window/OSX/SFViewController.mm
+++ b/ExtLibs/SFML/src/SFML/Window/OSX/SFViewController.mm
@@ -82,8 +82,11 @@ -(id)initWithView:(NSView *)view
////////////////////////////////////////////////////////
-(void)dealloc
{
+ NSLog(@"SFViewController::dealloc called on %@", self);
[self closeWindow];

+ // See https://github.com/SFML/SFML/issues/824
+ [[NSNotificationCenter defaultCenter] removeObserver:m_oglView];
[m_view release];
[m_oglView release];

0 comments on commit 4e32b64

Please sign in to comment.