diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-29 14:59:31 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-07-29 14:59:31 (GMT) |
| commit | 1e003176155bf05ba843bb4a93842154f842ef79 (patch) | |
| tree | 199953b22560e516e316464bfe7c4a19ebaa1bde /src | |
| parent | b76e4b734ba5a80d241b7b5e080cd530e16eeb3c (diff) | |
| download | mxe-1e003176155bf05ba843bb4a93842154f842ef79.zip mxe-1e003176155bf05ba843bb4a93842154f842ef79.tar.gz mxe-1e003176155bf05ba843bb4a93842154f842ef79.tar.bz2 | |
cegui: enable shared and x86_64 builds
Diffstat (limited to 'src')
| -rw-r--r-- | src/cegui.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cegui.mk b/src/cegui.mk index 36b647c..7493063 100644 --- a/src/cegui.mk +++ b/src/cegui.mk @@ -19,6 +19,7 @@ define $(PKG)_UPDATE endef # Use pkg-config to set FREEIMAGE_LIB and GLEW_STATIC to prevent "_imp__" errors +# freeimage and xerces don't have shared builds - disable with $(CMAKE_STATIC_BOOL) define $(PKG)_BUILD cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \ -DCEGUI_BUILD_STATIC_CONFIGURATION=$(CMAKE_STATIC_BOOL) \ @@ -27,14 +28,14 @@ define $(PKG)_BUILD -DCEGUI_BUILD_APPLICATION_TEMPLATES=OFF \ -DCEGUI_BUILD_LUA_MODULE=OFF \ -DCEGUI_BUILD_PYTHON_MODULES=OFF \ - -DCEGUI_BUILD_XMLPARSER_XERCES=ON \ + -DCEGUI_BUILD_XMLPARSER_XERCES=$(CMAKE_STATIC_BOOL) \ -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF \ -DCEGUI_BUILD_XMLPARSER_EXPAT=ON \ -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF \ -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF \ -DCEGUI_BUILD_IMAGECODEC_CORONA=OFF \ -DCEGUI_BUILD_IMAGECODEC_DEVIL=OFF \ - -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON \ + -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=$(CMAKE_STATIC_BOOL) \ -DCEGUI_BUILD_IMAGECODEC_PVR=OFF \ -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF \ -DCEGUI_BUILD_IMAGECODEC_SILLY=OFF \ @@ -61,7 +62,3 @@ define $(PKG)_BUILD '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-cegui.exe' \ `$(TARGET)-pkg-config --cflags --libs CEGUI-0-OPENGL glut gl` endef - -$(PKG)_BUILD_x86_64-w64-mingw32 = - -$(PKG)_BUILD_SHARED = |