Commit Graph

7332 Commits

Author SHA1 Message Date
Tony Theodore c2a1d8000a cegui: switch to tracking dev branch 2016-08-03 03:54:02 +10:00
Tony Theodore b5d6fd519e Merge pull request #1468 from dl5rcw/master
fix for #1462 where qt3d failed to build on JOBS := 4
2016-08-03 03:09:48 +10:00
Tony Theodore fb2880faf2 Merge pull request #1469 from LuaAndC/no2
use $(TEST_FILE) instead of $(2).c and other
2016-08-03 03:02:53 +10:00
Tony Theodore aba2b5112e Merge branch 'cegui-0.8' of https://github.com/Quintus/mxe into Quintus-cegui-0.8 2016-07-31 23:14:13 +10:00
MXEBot as Travis CI 81031687d4 Update versions.json & build-matrix.html 2016-07-31 03:55:59 +00:00
Mark Brand 7a38ddd810 update: curl, libidn 2016-07-31 05:54:37 +02:00
Boris Nagaev 17e40d3884 use $(TEST_FILE) instead of $(2).c and other
The following script was applied:

    set -xue

    find src/ plugins/ -name '*.mk' -type f > mks

    # special cases for test file:
    # ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated
    sed 's@$(2).c@$(PWD)/src/$(PKG)-test.c@g' -i \
        src/{boost,freeimage,hdf5,lapack,sdl,sdl_image,sdl_sound}.mk
    sed 's@$(2).f@$(PWD)/src/$(PKG)-test.f@g' -i src/lapack.mk
    sed 's@$(PWD)/$(2).pro@$(PWD)/src/$(PKG)-test.pro@g' -i \
        src/qt.mk plugins/examples/custom-qt-min/overrides.mk
    sed 's@$(2)-CMakeLists.txt@$(PWD)/src/$(PKG)-test-CMakeLists.txt@g' \
        -i src/{sdl_image,sdl_sound}.mk

    # check
    for base in $(ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated); do
        ! grep -q '$(2)' "${base}.mk"
    done

    # other $(2)
    sed 's@$(2).cpp@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).cxx@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).c@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).ml@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).f@$(TEST_FILE)@g' -i $(cat mks)

    # check
    ! grep '$(2)' $(cat mks)

See https://github.com/mxe/mxe/issues/1452
2016-07-30 22:38:45 +03:00
Tony Theodore 208f5cc850 Merge pull request #1465 from tonytheodore/freetype-cmake
FindFreetype.cmake: add INCLUDE_DIR
2016-07-31 04:18:04 +10:00
Quintus 2190231a95 Enable CEGUI OpenGL3, Direct3D9, Direct3D10 renderers.
They build just fine. The Direct3D11 renderer fails to build with
an include error and hence has not been enabled.
2016-07-30 15:03:55 +02:00
dl5rcw 3d83f14ecf fix for #1462 where qt3d failed to build on JOBS := 4 2016-07-30 14:24:11 +02:00
Quintus 3d09583655 Check explicitely for MinGW in CEGUI pkg-config patch. 2016-07-30 12:36:06 +02:00
Quintus 667ebf5891 Merge branch 'Quintus-cegui-0.8' of git://github.com/tonytheodore/mxe into cegui-0.8 2016-07-30 12:22:09 +02:00
Quintus f2ff4913cb Merge branch 'freetype-cmake' of git://github.com/tonytheodore/mxe into cegui-0.8 2016-07-30 12:10:10 +02:00
Quintus e6b7de09f6 Merge remote-tracking branch 'upstream/master' into cegui-0.8 2016-07-29 21:41:49 +02:00
Tony Theodore 1e00317615 cegui: enable shared and x86_64 builds 2016-07-30 00:59:31 +10:00
Tony Theodore b76e4b734b cegui: reformat and remove freetype2 workaround 2016-07-30 00:58:33 +10:00
Tony Theodore d55222f313 cegui: fix test and miminise invocation 2016-07-30 00:55:39 +10:00
Tony Theodore dafb826dbb cegui: unify patches 2016-07-30 00:54:28 +10:00
Tony Theodore 1d2563ad3d Merge branch 'cegui-0.8' of https://github.com/Quintus/mxe into Quintus-cegui-0.8 2016-07-29 23:02:26 +10:00
Quintus 8737985c5f Patch CEGUI build system to build the pkg-config files 2016-07-29 13:12:02 +02:00
Quintus d809a42c00 Fix glew build problems.
Cf. upstream ticket at
<https://bitbucket.org/cegui/cegui/issues/1131/opengl-renderers-fail-to-crosscompile-due>.
2016-07-29 12:43:43 +02:00
Tony Theodore 2d41575725 FindFreetype.cmake: add INCLUDE_DIR 2016-07-29 20:22:56 +10:00
Boris Nagaev d6349ea72a Merge pull request #1457 from LuaAndC/poppler-after-mman-win32
poppler: do not try to use mman.h
2016-07-28 12:38:53 +04:00
Boris Nagaev 11b6f3b0e2 Merge pull request #1459 from spthaolt/1374_problem_compiling_aubio
Solved #1374 problem compiling aubio
2016-07-27 21:37:36 +04:00
fiendish b2fee50a51 Use official Lua DLL version naming 2016-07-27 17:19:53 +02:00
Thao le c488cdd822 Solved #1374 problem compiling aubio 2016-07-27 21:38:19 +07:00
Boris Nagaev 6ccb318a0c poppler: do not try to use mman.h
fix https://github.com/mxe/mxe/issues/1455
2016-07-27 11:34:02 +03:00
Tony Theodore 526355876d Merge pull request #1456 from LuaAndC/master
add Issue and Pull Request templates
2016-07-27 16:25:27 +10:00
Boris Nagaev c4108bec32 add Issue and Pull Request templates
See https://github.com/mxe/mxe/issues/1235
2016-07-27 00:54:27 +03:00
Boris Nagaev 66ae4fda57 Revert "add Issue and Pull Request templates"
This reverts commit 54706f6f3f.

Pushed to upstream by mistake.
2016-07-27 00:38:18 +03:00
Boris Nagaev 54706f6f3f add Issue and Pull Request templates
See https://github.com/mxe/mxe/issues/1235
2016-07-27 00:36:31 +03:00
MXEBot as Travis CI 779e4988cd Update versions.json & build-matrix.html 2016-07-26 08:57:29 +00:00
Boris Nagaev 22db05376d Merge pull request #1286 from darealshinji/djvulibre
add package djvulibre
2016-07-26 12:56:33 +04:00
darealshinji d4b2eebc27 djvulibre: fixes 2016-07-25 14:12:55 +02:00
darealshinji 29050ec9aa Merge remote-tracking branch 'upstream/master' into djvulibre 2016-07-23 14:02:58 +02:00
MXEBot as Travis CI 263bf8b84c Update versions.json & build-matrix.html 2016-07-22 07:55:30 +00:00
Boris Nagaev b864d998dd Merge pull request #1449 from darealshinji/libspectre
New package 'libspectre'
2016-07-22 11:53:43 +04:00
darealshinji 54dacdb168 New package 'libspectre' 2016-07-22 00:56:56 +02:00
MXEBot as Travis CI 041ab69b45 Update versions.json & build-matrix.html 2016-07-21 07:07:06 +00:00
Boris Nagaev 62e9969076 Merge pull request #1382 from darealshinji/ghostscript
New package: ghostscript
2016-07-21 11:03:35 +04:00
Boris Nagaev fd4474b6a1 Merge pull request #1443 from tonytheodore/ocaml-camlimages-giflib
ocaml-camlimages: fix for giflib >=5.1
2016-07-20 20:28:22 +04:00
darealshinji cb2fe8983c Add package 'ghostscript' 2016-07-20 12:23:32 +02:00
Tony Theodore 801a2d1d9b Merge pull request #1445 from LuaAndC/build-pkg-ignore-gitignore
build-pkg: do not omit gitignored files in usr
2016-07-20 18:55:09 +10:00
Boris Nagaev 0e45796eeb build-pkg: track all files including gitignored
See https://github.com/mxe/mxe/pull/1443#issuecomment-233181951
2016-07-20 11:37:49 +03:00
Quintus d3dc40229c Start work to upgrade to CEGUI 0.8.x.
The build fails in the OpenGL parser with "_imp__" errors in GLEW
currently.
2016-07-19 19:38:53 +02:00
MXEBot as Travis CI 37a792bca9 Update versions.json & build-matrix.html 2016-07-17 15:48:24 +00:00
Mark Brand 6cc523e46b update qtxlsxwriter
Switched to de facto maintainer's fork.
2016-07-17 17:44:24 +02:00
Boris Nagaev 1c0f3d67b4 Merge pull request #1444 from tonytheodore/patch-gsed
patch.mk: portability fix for gsed
2016-07-17 15:24:27 +04:00
Tony Theodore dc122c2ba9 Merge pull request #1371 from tonytheodore/qt-mkspecs
qt: symlink mkspecs/default
2016-07-17 13:48:34 +10:00
Tony Theodore 7d04e40e29 qt: symlink mkspecs/default
On OSX, the default mkspec doesn't set `win32-g++` correctly.
The following workarounds are possible:
 - set `QMAKESPEC` env var
 - use `-spec` command line option
 - set `CONFIG+=`
 - symlink mkspecs/default

The internal build of qt always seems to use the `-spec` option,
but that doesn't solve the default case - the symlink approach used
on linux appears to always work.

closes #1379
2016-07-17 13:42:40 +10:00