chacha/OpenRA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated build scripts to remove an error from the check for missing methods in wxlua.

Browse Source 
The check is not necessary and it leads to a memory leak in wxlua.
This commit is contained in:
Paul Kulchenko
2015-11-26 15:56:30 -08:00
parent a62f5ff309
commit 927a7535a0
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/build-linux.sh
View File

@@ -193,6 +193,10 @@ if [ $BUILD_WXLUA ]; then
# http://www.mail-archive.com/wxlua-users@lists.sourceforge.net/msg03225.html
sed -i 's/\(m_wxlState = wxLuaState(wxlState.GetLuaState(), wxLUASTATE_GETSTATE|wxLUASTATE_ROOTSTATE);\)/\/\/ removed by ZBS build process \/\/ \1/' modules/wxlua/wxlcallb.cpp
# remove "Unable to call an unknown method..." error as it leads to a leak
# see http://sourceforge.net/p/wxlua/mailman/message/34629522/ for details
sed -i '/Unable to call an unknown method/{N;s/.*/ \/\/ removed by ZBS build process/}' modules/wxlua/wxlbind.cpp
cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_BUILD_TYPE=$WXLUABUILD -DBUILD_SHARED_LIBS=FALSE \
-DwxWidgets_CONFIG_EXECUTABLE="$INSTALL_DIR/bin/wx-config" \
-DwxWidgets_COMPONENTS="stc;html;aui;adv;core;net;base" \

4
build/build-macosx.sh
View File

@@ -204,6 +204,10 @@ if [ $BUILD_WXLUA ]; then
# http://www.mail-archive.com/wxlua-users@lists.sourceforge.net/msg03225.html
sed -i "" 's/\(m_wxlState = wxLuaState(wxlState.GetLuaState(), wxLUASTATE_GETSTATE|wxLUASTATE_ROOTSTATE);\)/\/\/ removed by ZBS build process \/\/ \1/' modules/wxlua/wxlcallb.cpp
# remove "Unable to call an unknown method..." error as it leads to a leak
# see http://sourceforge.net/p/wxlua/mailman/message/34629522/ for details
sed -i '/Unable to call an unknown method/{N;s/.*/ \/\/ removed by ZBS build process/}' modules/wxlua/wxlbind.cpp
cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_BUILD_TYPE=$WXLUABUILD -DBUILD_SHARED_LIBS=FALSE \
-DCMAKE_OSX_ARCHITECTURES=$MACOSX_ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_VERSION $MINSDK \
-DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DwxWidgets_CONFIG_EXECUTABLE="$INSTALL_DIR/bin/wx-config" \

4
build/build-win32.sh
View File

@@ -226,6 +226,10 @@ if [ $BUILD_WXLUA ]; then
# (temporary) fix for compilation issue in wxlua in Windows using mingw (r184)
sed -i 's/defined(__MINGW32__) || defined(__GNUWIN32__)/0/' modules/wxbind/src/wxcore_bind.cpp
# remove "Unable to call an unknown method..." error as it leads to a leak
# see http://sourceforge.net/p/wxlua/mailman/message/34629522/ for details
sed -i '/Unable to call an unknown method/{N;s/.*/ \/\/ removed by ZBS build process/}' modules/wxlua/wxlbind.cpp
[ -f "$INSTALL_DIR/lib/libwxscintilla-3.0.a" ] && cp "$INSTALL_DIR/lib/libwxscintilla-3.0.a" "$INSTALL_DIR/lib/libwx_mswu_scintilla-3.0.a"
[ -f "$INSTALL_DIR/lib/libwxscintilla-3.1.a" ] && cp "$INSTALL_DIR/lib/libwxscintilla-3.1.a" "$INSTALL_DIR/lib/libwx_mswu_scintilla-3.1.a"