Skip to content

Commit

Permalink
[build] Some mxe fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mean committed Aug 29, 2016
1 parent df48d43 commit 2c87e30
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 4 deletions.
2 changes: 1 addition & 1 deletion avidemux_core/ADM_coreSqlLight3/include/libsqlitewrapped.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _SYSLOG_H_SQLITE
#define _SYSLOG_H_SQLITE
#ifndef WIN32
#ifndef _WIN32

#include <syslog.h>

Expand Down
2 changes: 1 addition & 1 deletion avidemux_core/ADM_coreSqlLight3/src/SysLog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef WIN32
#ifndef _WIN32

#include <sqlite3.h>
#include <syslog.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ ass_rasterizer_c.c ass_blur.c ass_font.c
${Asm}
)

IF(WIN32 AND ("${CROSS_C_COMPILER}" STREQUAL "clang"))
IF(WIN32 AND NOT WIN64) # This is wrong, FIXME
SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} ass_rasterizer.c)
ENDIF(WIN32 AND ("${CROSS_C_COMPILER}" STREQUAL "clang"))
ENDIF(WIN32 AND NOT WIN64)
#
ADD_DEFINITIONS(" -std=gnu99 ")
#
Expand Down
1 change: 1 addition & 0 deletions avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
#include <math.h>
#include "DIA_flyDialog.h"
#include "ADM_default.h"
Expand Down
66 changes: 66 additions & 0 deletions bootStrapCrossMingw_w32Qt5_mxe.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#!/bin/bash
# ** Put your config here **
export QT_SELECT=5
export PATH=$PATH:/mingw/bin
export CROSS_PREFIX=i686-w64-mingw32.shared
export SDLDIR=/mingw
export MINGW=/mingw
export MINGWDEV=/mingw_dev
export QT_HOME=/mingw/Qt/current
export CXXFLAGS="-std=c++11"
export O_PARAL="-j 2"
export TOOLCHAIN_LOCATION=/mingw
export CROSS_C_COMPILER=gcc
export CROSS_CXX_COMPILER=g++

# ** Put your config here **

fail()
{
echo "** Failed at $1**"
exit 1
}

Process()
{
cd $TOP
export BUILDDIR=$1
export SCRIPT=$2
export EXTRA=$3
echo "Building $BUILDDIR from $SOURCEDIR (Extra=$EXTRA)"
rm -Rf ./$BUILDDIR
mkdir $BUILDDIR || fail mkdir
cd $BUILDDIR
sh $TOP/foreignBuilds/$SCRIPT $EXTRA || fail cmake
make $PARAL VERBOSE=1 || fail make
make install || fail make_install
# Only install component=dev for dev package
DESTDIR=${MINGWDEV} cmake -DCOMPONENT=dev -P cmake_install.cmake || fail make_install_dev
}

echo "**BootStrapping avidemux **"
rm -Rf ${MINGWDEV}/*
rm -Rf ${MINGW}/Release
mkdir -p ${MINGW}/Release
export TOP=$PWD
export PARAL="$O_PARAL"
echo "Top dir : $TOP"
echo "** CORE **"
cd $TOP
Process buildMingwCore cross_mingw64_core
echo "** QT4 **"
cd $TOP
Process buildMingwQt4 cross_mingw64_qt5
Process buildMingwCli cross_mingw_cli
#echo "** GTK **"
#cd $TOP
#Process buildGtk ../avidemux/gtk
echo "** Plugins **"
cd $TOP
Process buildMingwPluginsCommon cross_mingw64_plugins -DPLUGIN_UI=COMMON
Process buildMingwPluginsQt4 cross_mingw64_qt5_plugins -DPLUGIN_UI=QT4
Process buildMingwPluginsCli cross_mingw64_plugins -DPLUGIN_UI=CLI
Process buildMingwPluginsSettings cross_mingw64_plugins -DPLUGIN_UI=SETTINGS
echo "** All done **"
cd $TOP
echo "** ALL DONE **"

0 comments on commit 2c87e30

Please sign in to comment.