diff --git a/mingw-w64-ogitor-git/000-creating-translations.patch b/mingw-w64-ogitor-git/000-creating-translations.patch deleted file mode 100644 index 07c1a218c6..0000000000 --- a/mingw-w64-ogitor-git/000-creating-translations.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- ogitor/qtOgitor/CMakeLists.txt.orig 2018-07-24 09:44:04.657369400 +0300 -+++ ogitor/qtOgitor/CMakeLists.txt 2018-07-24 09:54:48.904101800 +0300 -@@ -8,6 +8,7 @@ - project(QtOgitor) - - find_package(Qt5Widgets REQUIRED) -+find_package(Qt5LinguistTools REQUIRED) - - if(UNIX AND NOT APPLE) - if(EXISTS /usr/share/kde4/apps/cmake/modules/KDE4Macros.cmake) -@@ -143,6 +144,25 @@ - ./include/uiterrainsquare.hxx - ./include/userdefined.hxx - ) -+ -+ if(Qt5LinguistTools_FOUND) -+ SET(QTOGITOR_TS_FILES -+ languages/ogitor_da.ts -+ languages/ogitor_de.ts -+ languages/ogitor_es.ts -+ languages/ogitor_fr.ts -+ languages/ogitor_it.ts -+ languages/ogitor_nl.ts -+ languages/ogitor_pt_BR.ts -+ languages/ogitor_ru.ts -+ languages/ogitor_tr.ts -+ languages/ogitor_zh.ts -+ ) -+ qt5_add_translation(QTOGITOR_TS_FILES ${QTOGITOR_TS_FILES}) -+ add_custom_target(translations DEPENDS ${QTOGITOR_TS_FILES}) -+ else() -+ SET(QTOGITOR_TS_FILES "") -+ endif() - - if(OGITOR_MESHMAGICK_INTERFACE) - set(OGITOR_QT_PREPROCESSOR "${OGITOR_QT_PREPROCESSOR} -DOGITOR_MESHMAGICK_INTERFACE") -@@ -191,7 +191,7 @@ - #endif(WIN32) - - if(NOT APPLE) -- ogitor_add_executable(qtOgitor WIN32 ${SRCS} ${RESOURCE_SRCS} ${qtOgitor_res}) -+ ogitor_add_executable(qtOgitor WIN32 ${SRCS} ${RESOURCE_SRCS} ${qtOgitor_res} ${QTOGITOR_TS_FILES}) - else() - # The first time we build Ogitor.framework will not exist so create a dummy file if necessary - find_file(OGITOR_FRAMEWORK_FILE Ogitor.framework "${CMAKE_BINARY_DIR}/Ogitor/lib/Debug/" NO_SYSTEM_ENVIRONMENT_PATH) -@@ -218,6 +218,7 @@ - ${SRCS} - ${RESOURCE_SRCS} - ${qtOgitor_res} -+ ${QTOGITOR_TS_FILES} - ) - #add_dependencies(qtOgitor OgCaelum) - #add_dependencies(qtOgitor OgHydrax) -@@ -287,27 +308,15 @@ - endif(HAS_KDE) - - endif(OGITOR_DIST) -- -- install(CODE "EXECUTE_PROCESS(COMMAND sh ${CMAKE_SOURCE_DIR}/gen-qt-projectfile ${CMAKE_SOURCE_DIR} OUTPUT_FILE ${CMAKE_SOURCE_DIR}/qtOgitor/languages/translate.pro)") -- install(CODE "EXECUTE_PROCESS(COMMAND lrelease ${CMAKE_SOURCE_DIR}/qtOgitor/languages/translate.pro)") -- install(DIRECTORY ${CMAKE_SOURCE_DIR}/qtOgitor/languages -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ogitor -- PATTERN "*.qm" -- PATTERN "*.ts" EXCLUDE -- PATTERN "*.pro" EXCLUDE -- PATTERN "*.exe" EXCLUDE -- PATTERN "*.bat" EXCLUDE -- ) -- elseif(WINDOWS) -- # ie Windows -- install(DIRECTORY ${CMAKE_SOURCE_DIR}/RunPath/languages -- DESTINATION ${PREFIX} -- PATTERN "translate.pro" EXCLUDE -- PATTERN "*.ts" EXCLUDE -- PATTERN "*.exe" EXCLUDE -- PATTERN "*.bat" EXCLUDE -- ) - endif(UNIX) -+ -+ if(Qt5LinguistTools_FOUND) -+ if(UNIX) -+ install(FILES ${QTOGITOR_TS_FILES} DESTINATION ${OGITOR_LANGUAGE_PATH}) -+ elseif(WIN32) -+ install(FILES ${QTOGITOR_TS_FILES} DESTINATION ${PREFIX}) -+ endif(UNIX) -+ endif() - - if(WIN32) - if(OGITOR_MESHMAGICK_INTERFACE) diff --git a/mingw-w64-ogitor-git/001-dont-install-3rdparty-libraries.patch b/mingw-w64-ogitor-git/001-dont-install-3rdparty-libraries.patch deleted file mode 100644 index 380ef54327..0000000000 --- a/mingw-w64-ogitor-git/001-dont-install-3rdparty-libraries.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ogitor/CMakeLists.txt.orig 2018-07-23 08:12:49.245734200 +0300 -+++ ogitor/CMakeLists.txt 2018-07-23 08:18:12.723503200 +0300 -@@ -288,7 +288,7 @@ - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/qtOgitor/languages - ) - --if(WIN32) -+if(MSVC) - include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/install/windows.cmake) - endif() - diff --git a/mingw-w64-ogitor-git/001-unbundle-tinyxml.patch b/mingw-w64-ogitor-git/001-unbundle-tinyxml.patch new file mode 100644 index 0000000000..0d21503f72 --- /dev/null +++ b/mingw-w64-ogitor-git/001-unbundle-tinyxml.patch @@ -0,0 +1,68 @@ +--- a/Dependencies/CMakeLists.txt ++++ b/Dependencies/CMakeLists.txt +@@ -38,4 +38,4 @@ + #) + #set_target_properties(Skyx PROPERTIES FOLDER Dependencies) + +-add_subdirectory(TinyXML) +\ No newline at end of file ++#add_subdirectory(TinyXML) +\ No newline at end of file +--- a/Ogitor/CMakeLists.txt ++++ b/Ogitor/CMakeLists.txt +@@ -145,7 +145,7 @@ + + message(STATUS ${OGRE_LIBRARY}) + +-target_link_libraries(Ogitor ${OGRE_LIBRARIES} OFS OgreTerrainConverter PagedGeometry TinyXML) ++target_link_libraries(Ogitor ${OGRE_LIBRARIES} OFS OgreTerrainConverter PagedGeometry tinyxml) + + # specify a precompiled header to use + use_precompiled_header(Ogitor +--- a/Plugins/DotSceneSerializer/CMakeLists.txt ++++ b/Plugins/DotSceneSerializer/CMakeLists.txt +@@ -27,7 +27,7 @@ + link_directories(${OGITOR_LIBPATH}) + link_directories(${DEPENDENCIES_LIBPATH}) + +-link_libraries(${OGRE_LIBRARIES} Ogitor TinyXML) ++link_libraries(${OGRE_LIBRARIES} Ogitor tinyxml) + ogitor_add_library(DotSceneSerializer SHARED ${HEADER_FILES} ${SOURCE_FILES}) + #target_link_libraries(OgreMain Ogitor) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)= +--- a/Plugins/OgModularZone/CMakeLists.txt ++++ b/Plugins/OgModularZone/CMakeLists.txt +@@ -75,7 +75,7 @@ + link_directories(${OGITOR_LIBPATH}) + link_directories(${DEPENDENCIES_LIBPATH}) + +- link_libraries(${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor TinyXML) ++ link_libraries(${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor tinyxml) + ogitor_add_library(OgModularZone SHARED ${SRCS}) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) + +--- a/Plugins/OgScreenEffectEditor/CMakeLists.txt ++++ b/Plugins/OgScreenEffectEditor/CMakeLists.txt +@@ -62,7 +62,7 @@ + link_directories(${OGITOR_LIBPATH}) + link_directories(${DEPENDENCIES_LIBPATH}) + +- link_libraries(${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor TinyXML) ++ link_libraries(${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor tinyxml) + ogitor_add_library(OgScreenEffectEditor SHARED ${SRCS}) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) + +--- a/qtOgitor/CMakeLists.txt ++++ b/qtOgitor/CMakeLists.txt +@@ -259,9 +259,9 @@ + list(APPEND OGRE_LIBRARIES OgreBitesQt) + + if(OGITOR_MESHMAGICK_INTERFACE) +- target_link_libraries(qtOgitor QtPropertyBrowser ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor meshmagick_shared_lib ImageConverter GenericTextEditor GenericImageEditor TinyXML) ++ target_link_libraries(qtOgitor QtPropertyBrowser ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor meshmagick_shared_lib ImageConverter GenericTextEditor GenericImageEditor tinyxml) + else(OGITOR_MESHMAGICK_INTERFACE) +- target_link_libraries(qtOgitor QtPropertyBrowser ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor ImageConverter GenericTextEditor GenericImageEditor TinyXML) ++ target_link_libraries(qtOgitor QtPropertyBrowser ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} Ogitor ImageConverter GenericTextEditor GenericImageEditor tinyxml) + endif(OGITOR_MESHMAGICK_INTERFACE) + + if(APPLE) diff --git a/mingw-w64-ogitor-git/002-Fix-some-cxx-issues.patch b/mingw-w64-ogitor-git/002-Fix-some-cxx-issues.patch new file mode 100644 index 0000000000..12e58c350c --- /dev/null +++ b/mingw-w64-ogitor-git/002-Fix-some-cxx-issues.patch @@ -0,0 +1,54 @@ +--- a/Dependencies/pagedgeometry/include/ImpostorPage.h ++++ b/Dependencies/pagedgeometry/include/ImpostorPage.h +@@ -375,9 +375,10 @@ + { + return prefix + Ogre::StringConverter::toString(++GUID); + } +- ++#ifndef IMPOSTOR_FILE_SAVE + //This will only be used when IMPOSTOR_FILE_SAVE is set to 0 + std::auto_ptr loader; ++#endif + }; + + +--- a/Dependencies/pagedgeometry/source/ImpostorPage.cpp ++++ b/Dependencies/pagedgeometry/source/ImpostorPage.cpp +@@ -378,8 +378,12 @@ + + //Do not use this constructor yourself - instead, call getTexture() + //to get/create an ImpostorTexture for an Entity. ++#ifdef IMPOSTOR_FILE_SAVE ++ImpostorTexture::ImpostorTexture(ImpostorPage *group, Entity *entity) ++#else + ImpostorTexture::ImpostorTexture(ImpostorPage *group, Entity *entity) : + loader(0) ++#endif + { + //Store scene manager and entity + ImpostorTexture::sceneMgr = group->getParentPagedGeometry()->getSceneManager(); +@@ -497,8 +501,13 @@ + Ogre::uint textureSize = ImpostorPage::getImpostorResolution(); + if (!renderTexture) + { ++#ifdef IMPOSTOR_FILE_SAVE ++ renderTexture = TextureManager::getSingleton().createManual(getUniqueID("ImpostorTexture"), "Impostors", ++ TEX_TYPE_2D, textureSize * IMPOSTOR_YAW_ANGLES, textureSize * IMPOSTOR_PITCH_ANGLES, 0, PF_BYTE_RGBA, TU_RENDERTARGET); ++#else + renderTexture = TextureManager::getSingleton().createManual(getUniqueID("ImpostorTexture"), "Impostors", + TEX_TYPE_2D, textureSize * IMPOSTOR_YAW_ANGLES, textureSize * IMPOSTOR_PITCH_ANGLES, 0, PF_BYTE_RGBA, TU_RENDERTARGET, loader.get()); ++#endif + } + renderTexture->setNumMipmaps(MIP_UNLIMITED); + +--- a/Plugins/OgAngelScript/AngelScriptInterpreter.cpp ++++ b/Plugins/OgAngelScript/AngelScriptInterpreter.cpp +@@ -476,7 +476,7 @@ + ctx = newdef.context; + } + +- if( def->funcID < 0 ) ++ if( def->funcID == NULL ) + { + // The function couldn't be found. Instruct the script writer + // to include the expected function in the script. diff --git a/mingw-w64-ogitor-git/002-install-layout.patch b/mingw-w64-ogitor-git/002-install-layout.patch deleted file mode 100644 index acccfabab7..0000000000 --- a/mingw-w64-ogitor-git/002-install-layout.patch +++ /dev/null @@ -1,154 +0,0 @@ ---- ogitor/CMakeLists.txt.orig 2018-07-23 08:19:35.325648300 +0300 -+++ ogitor/CMakeLists.txt 2018-07-23 08:23:41.393481100 +0300 -@@ -52,7 +52,7 @@ - option(OGITOR_DOWNLOAD_SAMPLEMEDIA "Download and install sample media" TRUE) - - # Somehow, relative paths doesn't work on Linux when installing files.. --if(UNIX) -+if(UNIX OR MINGW) - set(PREFIX ${CMAKE_INSTALL_PREFIX}) - else() - set(PREFIX "./") -@@ -171,15 +171,15 @@ - # We are on Windows - set(OGITOR_BIN_PATH "." CACHE PATH "Ogitor bin path" FORCE) - set(OGITOR_RUN_PATH "." CACHE PATH "Ogitor run path" FORCE) -- set(OGITOR_RESOURCE_PATH "." CACHE PATH "Ogitor resource path" FORCE) -- set(OGITOR_LANGUAGE_PATH "../languages" CACHE PATH "Ogitor languages path" FORCE) -- set(OGITOR_MEDIA_PATH "../Media" CACHE PATH "Ogitor media path" FORCE) -- set(OGITOR_PROJECTS_PATH "../Projects" CACHE PATH "Ogitor Projects path" FORCE) -- set(OGITOR_SCRIPTS_PATH "../Scripts" CACHE PATH "Ogitor scripts path" FORCE) -- set(OGITOR_PLUGIN_PATH "../Plugins" CACHE PATH "Ogitor plugins path" FORCE) -- set(OGITOR_PLUGIN_ICON_PATH "../Plugins/Icons" CACHE PATH "Ogitor plugins icon path" FORCE) -- set(OGITOR_LIBOGREOFSPLUGIN_PATH "." CACHE PATH "libOgreOfsPlugin path" FORCE) -- configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/Templates/resources.cfg.in ${CMAKE_INSTALL_PREFIX}/bin/resources.cfg) -+ set(OGITOR_RESOURCE_PATH "../share/ogitor" CACHE PATH "Ogitor resource path" FORCE) -+ set(OGITOR_LANGUAGE_PATH "../share/ogitor/languages" CACHE PATH "Ogitor languages path" FORCE) -+ set(OGITOR_MEDIA_PATH "../share/ogitor/Media" CACHE PATH "Ogitor media path" FORCE) -+ set(OGITOR_PROJECTS_PATH "../share/ogitor/Projects" CACHE PATH "Ogitor Projects path" FORCE) -+ set(OGITOR_SCRIPTS_PATH "../share/ogitor/Scripts" CACHE PATH "Ogitor scripts path" FORCE) -+ set(OGITOR_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/lib/ogitor/" CACHE PATH "Ogitor plugins path" FORCE) -+ set(OGITOR_PLUGIN_ICON_PATH "../share/ogitor/Plugins/Icons" CACHE PATH "Ogitor plugins icon path" FORCE) -+ set(OGITOR_LIBOGREOFSPLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "libOgreOfsPlugin path" FORCE) -+ configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/Templates/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/RunPath/bin/resources_ogitor.cfg) - endif(UNIX) - - # hide advanced options ---- ogitor/qtOgitor/CMakeLists.txt.orig 2018-07-24 11:39:35.576965200 +0300 -+++ ogitor/qtOgitor/CMakeLists.txt 2018-07-24 11:39:52.502995000 +0300 -@@ -306,7 +306,7 @@ - if(UNIX) - install(FILES ${QTOGITOR_TS_FILES} DESTINATION ${OGITOR_LANGUAGE_PATH}) - elseif(WIN32) -- install(FILES ${QTOGITOR_TS_FILES} DESTINATION ${PREFIX}) -+ install(FILES ${QTOGITOR_TS_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/ogitor/languages") - endif(UNIX) - endif() - ---- ogitor/Ogitor/src/OgitorsRoot.cpp.orig 2018-07-23 15:09:46.089965200 +0300 -+++ ogitor/Ogitor/src/OgitorsRoot.cpp 2018-07-23 15:11:01.470070700 +0300 -@@ -756,9 +756,9 @@ - - #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 - #ifdef DEBUG -- mSystem->GetFileList("../Plugins/*Script_d.dll", scriptPluginList); -+ mSystem->GetFileList("../lib/ogitor/*Script_d.dll", scriptPluginList); - #else -- mSystem->GetFileList("../Plugins/*Script.dll", scriptPluginList); -+ mSystem->GetFileList("../lib/ogitor/*Script.dll", scriptPluginList); - #endif - #elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX - #ifdef DEBUG -@@ -797,9 +797,9 @@ - - #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 - #ifdef DEBUG -- mSystem->GetFileList("../Plugins/*_d.dll", pluginList); -+ mSystem->GetFileList("../lib/ogitor/*_d.dll", pluginList); - #else -- mSystem->GetFileList("../Plugins/*.dll", pluginList); -+ mSystem->GetFileList("../lib/ogitor/*.dll", pluginList); - #endif - #elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX - #ifdef DEBUG ---- ogitor/RunPath/CMakeLists.txt.orig 2018-07-23 15:39:46.701234300 +0300 -+++ ogitor/RunPath/CMakeLists.txt 2018-07-23 15:40:53.331327600 +0300 -@@ -3,7 +3,7 @@ - ############################################################### - - # Set media target directory --if(WIN32) -+if(MSVC) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/RunPath/ - DESTINATION ${PREFIX} - CONFIGURATIONS Release RelWithDebInfo MinSizeRel -@@ -26,34 +26,28 @@ - DESTINATION bin - CONFIGURATIONS Debug - ) --endif(WIN32) -+endif(MSVC) - --if(UNIX) -+if(UNIX OR MINGW) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/RunPath/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ogitor - PATTERN "CMakeLists.txt" EXCLUDE - PATTERN "Debug" EXCLUDE -- PATTERN "Projects" EXCLUDE - PATTERN "bin" EXCLUDE - PATTERN ".xml" EXCLUDE - PATTERN "Plugins/icon_backup" EXCLUDE - ) - -- if(OGITOR_DIST) -- install(FILES -- ${CMAKE_BINARY_DIR}/RunPath/bin/resources.cfg -- # Sample app only installed locally ? -- #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig.xml -- #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig_dist.xml -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ogitor -- ) -- else(OGITOR_DIST) -- install(FILES ${CMAKE_SOURCE_DIR}/RunPath/bin/SampleAppConfig.xml -- #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig_dist.xml -- DESTINATION bin -- ) -- endif(OGITOR_DIST) --endif(UNIX) -+ install(FILES -+ ${CMAKE_BINARY_DIR}/RunPath/bin/resources_ogitor.cfg -+ # Sample app only installed locally ? -+ #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig.xml -+ #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig_dist.xml -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+ install(FILES ${CMAKE_SOURCE_DIR}/RunPath/bin/SampleAppConfig.xml -+ #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig_dist.xml -+ DESTINATION bin) -+endif(UNIX OR MINGW) - - if (APPLE) - file(COPY Plugins/Icons DESTINATION ${CMAKE_BINARY_DIR}/Plugins) ---- ogitor/OgreOfsPlugin/CMakeLists.txt.orig 2018-07-23 15:45:49.631742400 +0300 -+++ ogitor/OgreOfsPlugin/CMakeLists.txt 2018-07-23 15:46:03.981762500 +0300 -@@ -22,7 +22,7 @@ - target_link_libraries(OgreOfsPlugin ${OGRE_LIBRARIES} OFS ${Boost_REGEX_LIBRARY}) - - install(TARGETS OgreOfsPlugin -- LIBRARY DESTINATION ${OGITOR_LIBOGREOFSPLUGIN_PATH} -- ARCHIVE DESTINATION ${OGITOR_LIBOGREOFSPLUGIN_PATH} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - RUNTIME DESTINATION ${OGITOR_LIBOGREOFSPLUGIN_PATH}) - # vim: set sw=2 ts=2 noet: ---- ogitor/qtOgitor/src/main.cpp.orig 2018-07-24 11:44:37.148495800 +0300 -+++ ogitor/qtOgitor/src/main.cpp 2018-07-24 11:44:44.355708400 +0300 -@@ -70,7 +70,7 @@ - - Ogre::ConfigFile cf; - std::string cfPath = resourcePath(); -- cfPath.append("resources.cfg"); -+ cfPath.append("resources_ogitor.cfg"); - cf.load(cfPath); - - // Go through all sections & settings in the file diff --git a/mingw-w64-ogitor-git/003-fix-installation-destination.patch b/mingw-w64-ogitor-git/003-fix-installation-destination.patch new file mode 100644 index 0000000000..d8fc683e80 --- /dev/null +++ b/mingw-w64-ogitor-git/003-fix-installation-destination.patch @@ -0,0 +1,109 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,7 +140,7 @@ + set(OGITOR_UNITY_FILES_PER_UNIT "50" CACHE STRING "Number of files per compilation unit in Unity build.") + + # configure global paths for OgitorsGlobals +-if(UNIX) ++if(UNIX OR MINGW) + set(DBG_POSTFIX "") + set(OGITOR_BIN_PATH "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Ogitor bin path" FORCE) + set(OGITOR_RUN_PATH "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Ogitor run path" FORCE) +@@ -161,7 +161,7 @@ + if (APPLE) + set(OGITOR_PLUGIN_ICON_PATH "../Plugins/Icons" CACHE PATH "Ogitor plugins icon path" FORCE) + endif(APPLE) +-else(UNIX) ++else(UNIX OR MINGW) + # We are on Windows + set(OGITOR_BIN_PATH "." CACHE PATH "Ogitor bin path" FORCE) + set(OGITOR_RUN_PATH "." CACHE PATH "Ogitor run path" FORCE) +@@ -173,7 +173,7 @@ + set(OGITOR_PLUGIN_PATH "../Plugins" CACHE PATH "Ogitor plugins path" FORCE) + set(OGITOR_PLUGIN_ICON_PATH "../Plugins/Icons" CACHE PATH "Ogitor plugins icon path" FORCE) + set(OGITOR_LIBOGREOFSPLUGIN_PATH "." CACHE PATH "libOgreOfsPlugin path" FORCE) +-endif(UNIX) ++endif(UNIX OR MINGW) + + if(NOT IS_ABSOLUTE ${OGITOR_LANGUAGE_PATH}) + set(OGITOR_LANGUAGE_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/bin/${OGITOR_LANGUAGE_PATH}") +@@ -279,7 +279,7 @@ + + include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/install.cmake) + +-if(UNIX) ++if(UNIX OR MINGW) + # apple and linux + if(OGITOR_DIST) + FILE(GLOB ogitor_cmake_scripts "${CMAKE_SOURCE_DIR}/CMakeModules/findscripts/*.cmake") +--- a/RunPath/CMakeLists.txt ++++ b/RunPath/CMakeLists.txt +@@ -3,7 +3,7 @@ + ############################################################### + + # Set media target directory +-if(WIN32) ++if(MSVC) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/RunPath/ + DESTINATION ${CMAKE_INSTALL_PREFIX} + CONFIGURATIONS Release RelWithDebInfo MinSizeRel +@@ -26,9 +26,9 @@ + DESTINATION bin + CONFIGURATIONS Debug + ) +-endif(WIN32) ++endif(MSVC) + +-if(UNIX) ++if(UNIX OR MINGW) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/RunPath/ + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ogitor + PATTERN "CMakeLists.txt" EXCLUDE +@@ -51,7 +51,7 @@ + #${CMAKE_CURRENT_SOURCE_DIR}/bin/SampleAppConfig_dist.xml + DESTINATION bin + ) +-endif(UNIX) ++endif(UNIX OR MINGW) + + if (APPLE) + file(COPY Plugins/Icons DESTINATION ${CMAKE_BINARY_DIR}/Plugins) +--- a/Ogitor/src/OgitorsRoot.cpp ++++ b/Ogitor/src/OgitorsRoot.cpp +@@ -756,9 +756,9 @@ + + #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 + #ifdef DEBUG +- mSystem->GetFileList("../Plugins/*Script_d.dll", scriptPluginList); ++ mSystem->GetFileList("../lib/ogitor/*Script_d.dll", scriptPluginList); + #else +- mSystem->GetFileList("../Plugins/*Script.dll", scriptPluginList); ++ mSystem->GetFileList("../lib/ogitor/*Script.dll", scriptPluginList); + #endif + #elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX + #ifdef DEBUG +@@ -797,9 +797,9 @@ + + #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 + #ifdef DEBUG +- mSystem->GetFileList("../Plugins/*_d.dll", pluginList); ++ mSystem->GetFileList("../lib/ogitor/*_d.dll", pluginList); + #else +- mSystem->GetFileList("../Plugins/*.dll", pluginList); ++ mSystem->GetFileList("../lib/ogitor/*.dll", pluginList); + #endif + #elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX + #ifdef DEBUG +--- a/OgreOfsPlugin/CMakeLists.txt ++++ b/OgreOfsPlugin/CMakeLists.txt +@@ -20,7 +20,7 @@ + target_link_libraries(OgreOfsPlugin ${OGRE_LIBRARIES} OFS) + + install(TARGETS OgreOfsPlugin +- LIBRARY DESTINATION ${OGITOR_LIBOGREOFSPLUGIN_INSTALL_PATH} +- ARCHIVE DESTINATION ${OGITOR_LIBOGREOFSPLUGIN_INSTALL_PATH} +- RUNTIME DESTINATION ${OGITOR_LIBOGREOFSPLUGIN_INSTALL_PATH}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + # vim: set sw=2 ts=2 noet: diff --git a/mingw-w64-ogitor-git/003-fix-samples-destination.patch b/mingw-w64-ogitor-git/003-fix-samples-destination.patch deleted file mode 100644 index dd37c72dd6..0000000000 --- a/mingw-w64-ogitor-git/003-fix-samples-destination.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ogitor/CMakeLists.txt.orig 2018-07-24 07:29:32.366640700 +0300 -+++ ogitor/CMakeLists.txt 2018-07-24 07:37:09.107891500 +0300 -@@ -221,7 +221,7 @@ - URL https://github.com/OGRECave/ogitor/releases/download/v0.5.5/projects.zip - PREFIX ${CMAKE_CURRENT_BINARY_DIR} - PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory -- "${CMAKE_CURRENT_BINARY_DIR}/src/SampleProject" "${OGITOR_PROJECTS_PATH}" -+ "${CMAKE_CURRENT_BINARY_DIR}/src/SampleProject" "${CMAKE_CURRENT_SOURCE_DIR}/RunPath/Projects" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" -@@ -235,7 +235,7 @@ - URL https://github.com/OGRECave/ogitor/releases/download/v0.5.5/media.zip - PREFIX ${CMAKE_CURRENT_BINARY_DIR} - PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory -- "${CMAKE_CURRENT_BINARY_DIR}/src/SampleMedia" "${OGITOR_MEDIA_PATH}" -+ "${CMAKE_CURRENT_BINARY_DIR}/src/SampleMedia" "${CMAKE_CURRENT_SOURCE_DIR}/RunPath/Media" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" diff --git a/mingw-w64-ogitor-git/004-fix-plugin-name-for-ogre.patch b/mingw-w64-ogitor-git/004-fix-plugin-name-for-ogre.patch index 0cc1ff9031..e3825d7ed4 100644 --- a/mingw-w64-ogitor-git/004-fix-plugin-name-for-ogre.patch +++ b/mingw-w64-ogitor-git/004-fix-plugin-name-for-ogre.patch @@ -1,6 +1,6 @@ ---- ogitor/OgreOfsPlugin/CMakeLists.txt.orig 2018-07-24 13:16:44.892880100 +0300 -+++ ogitor/OgreOfsPlugin/CMakeLists.txt 2018-07-24 13:16:48.324886100 +0300 -@@ -19,6 +19,10 @@ +--- a/OgreOfsPlugin/CMakeLists.txt ++++ b/OgreOfsPlugin/CMakeLists.txt +@@ -17,6 +17,10 @@ set_target_properties(OgreOfsPlugin PROPERTIES COMPILE_DEFINITIONS "PLUGIN_EXPORT") @@ -8,6 +8,6 @@ + set_target_properties(OgreOfsPlugin PROPERTIES PREFIX "") +endif() + - target_link_libraries(OgreOfsPlugin ${OGRE_LIBRARIES} OFS ${Boost_REGEX_LIBRARY}) + target_link_libraries(OgreOfsPlugin ${OGRE_LIBRARIES} OFS) install(TARGETS OgreOfsPlugin diff --git a/mingw-w64-ogitor-git/050-pagedgeometry-msvc-stuff.patch b/mingw-w64-ogitor-git/050-pagedgeometry-msvc-stuff.patch deleted file mode 100644 index 23dfaa4332..0000000000 --- a/mingw-w64-ogitor-git/050-pagedgeometry-msvc-stuff.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ogre-pagedgeometry/CMakeLists.txt.orig 2018-07-23 09:23:55.472168200 +0300 -+++ ogre-pagedgeometry/CMakeLists.txt 2018-07-23 09:24:13.240599400 +0300 -@@ -49,7 +49,7 @@ - - - # some optimization flags --if(WIN32) -+if(MSVC) - # add multi processor compilation flags - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /GL /Ox /Ob2 /Oi /Ot /Oy /fp:fast /GS- /MP /Zi") - set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP /Zi") -@@ -63,10 +63,10 @@ - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF") - set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF") --ELSEIF(UNIX) -+ELSEIF() - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -mfpmath=sse -msse2 -mmmx -msse -msse3 -m3dnow -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math -ftracer") - set(CMAKE_EXE_LINKER_FLAGS_RelWithDebug "${CMAKE_EXE_LINKER_FLAGS_RelWithDebug} -O0") --endif(WIN32) -+endif() - - # some PG build options - set(PAGEDGEOMETRY_BUILD_SAMPLES "FALSE" CACHE BOOL "build the examples") diff --git a/mingw-w64-ogitor-git/051-gettickcount-declaration.patch b/mingw-w64-ogitor-git/051-gettickcount-declaration.patch deleted file mode 100644 index 0da45d8629..0000000000 --- a/mingw-w64-ogitor-git/051-gettickcount-declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ogre-pagedgeometry/include/RandomTable.h.orig 2018-07-23 09:30:10.545421500 +0300 -+++ ogre-pagedgeometry/include/RandomTable.h 2018-07-23 09:34:35.506087400 +0300 -@@ -16,6 +16,10 @@ - - #include // for time - #include "MersenneTwister.h" -+#ifdef _WIN32 -+#define _WIN32_WINNT 0x0600 -+#include -+#endif - - // random table class that speeds up PG a bit - class RandomTable diff --git a/mingw-w64-ogitor-git/PKGBUILD b/mingw-w64-ogitor-git/PKGBUILD index bdb28617e5..016e9570e2 100644 --- a/mingw-w64-ogitor-git/PKGBUILD +++ b/mingw-w64-ogitor-git/PKGBUILD @@ -5,36 +5,34 @@ pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=r816.cf42232 +pkgver=r893.58e2cca pkgrel=1 pkgdesc="WYSIWYG scene editing environment for OGRE (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64') url="https://www.ogre3d.org/" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-qt5-tools" "git") depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread" "${MINGW_PACKAGE_PREFIX}-ogre3d" "${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-qt5") + "${MINGW_PACKAGE_PREFIX}-qt5-base") options=('staticlibs' '!strip' '!buildflags') -_commit="cf42232fd5f76f71bcf26d9e819827817af62495" +_commit="58e2cca70872c9ce63c3f30684b171f0fbb54043" source=("${_realname}::git+https://github.com/OGRECave/ogitor.git#commit=${_commit}" Hydrax.zip OgreCore.zip SkyX.zip SO3Deferred.zip SO3SelectionBuffer.zip - 000-creating-translations.patch - 001-dont-install-3rdparty-libraries.patch - 002-install-layout.patch - 003-fix-samples-destination.patch + 001-unbundle-tinyxml.patch + 002-Fix-some-cxx-issues.patch + 003-fix-installation-destination.patch 004-fix-plugin-name-for-ogre.patch - 050-pagedgeometry-msvc-stuff.patch - 051-gettickcount-declaration.patch 052-install-files.patch) sha256sums=('SKIP' '1616c72e07bf2b9f071b9a5a33f2bf59dd0eebfc86f1f010a8bb7c3a3e7a579e' @@ -42,13 +40,10 @@ sha256sums=('SKIP' 'c45c0d5815f1909e9c59f57bae9b75864119bfc069bb447ea7adb5c9571a6230' 'e60ca5aae39bd801b07340576caef8d3b1351e7426cfb41422be8ff5624f2ef4' '495c01d952888aee4a2c90e30d0c4113d18a506824e0f24d114d7464c3c1728e' - '6d206b6d03fc4931901093a45a9c3b9762c187d81c9c5fbd11c590f8b4c67bf4' - '9e3ce86d3ce06ea8d3ab935e185a19cff3e9996b8e7424e17eafed11edcb6482' - 'adb01084f0cb9eba7864ff4628a03292c33a94de5e347fdb3e436de9be3b7e83' - '0529545c363bdb656c4d8049d20eda367d57c73d1b7b37f757dcecf12e965ade' - '72f8c637aa0e5c62a8b5a12b7a7b6948b9769f555e4f18614f92f6b045676a69' - '07ed202e28ae12aa48dc5a23601cb2b0b18548b4745028b5ee61c78de3db2f22' - 'b293f9c887a3868fc6429e7e21e79ee651d0f3fa1a2876fe6314fd06407f5be2' + '6a6d71b6b0e44a7a0aac1da5d51be4cb5a94dc72128bf3bfe86244fee044c413' + 'fa280fb021aea35b7bfb8e1f3fb3616ac64a7c6035a0122e82353c9751b590fc' + '16554c899888977386fb45f89e983f16faa11dde403ca94eb1ce31037e9f2aed' + 'd82a54df0c67f76e97e0ef395195035fedbfffe3b9098f7c57e48c0125451e10' '6510fae2f0ea627216ce954f55bdcae78827589becb56549cd92f63a2dc1f077') noextract=(Hydrax.zip OgreCore.zip @@ -65,15 +60,13 @@ prepare() { cd "${srcdir}/${_realname}" git submodule update --init - patch -p1 -i ${srcdir}/000-creating-translations.patch - patch -p1 -i ${srcdir}/001-dont-install-3rdparty-libraries.patch - patch -p1 -i ${srcdir}/002-install-layout.patch - patch -p1 -i ${srcdir}/003-fix-samples-destination.patch + + patch -p1 -i ${srcdir}/001-unbundle-tinyxml.patch + patch -p1 -i ${srcdir}/002-Fix-some-cxx-issues.patch + patch -p1 -i ${srcdir}/003-fix-installation-destination.patch patch -p1 -i ${srcdir}/004-fix-plugin-name-for-ogre.patch cd Dependencies/pagedgeometry/ - patch -p1 -i ${srcdir}/050-pagedgeometry-msvc-stuff.patch - patch -p1 -i ${srcdir}/051-gettickcount-declaration.patch patch -p1 -i ${srcdir}/052-install-files.patch } @@ -85,28 +78,28 @@ build() { extra_config+=( -DCMAKE_BUILD_TYPE=Release ) fi - rm -rf ${srcdir}/build-${MINGW_CHOST} - mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + rm -rf ${srcdir}/build-${MSYSTEM} + mkdir build-${MSYSTEM} && cd build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \ OGRE_HOME=${MINGW_PREFIX} \ QTDIR=${MINGW_PREFIX} \ - ${MINGW_PREFIX}/bin/cmake.exe \ - -G"MSYS Makefiles" \ + ${MINGW_PREFIX}/bin/cmake.exe -Wno-dev \ + -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ ${extra_config} \ ../${_realname} - make + ${MINGW_PREFIX}/bin/cmake --build . } package() { - cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="${pkgdir}" -j1 install + cd "${srcdir}/build-${MSYSTEM}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . - cp -f ${srcdir}/Hydrax.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ + # cp -f ${srcdir}/Hydrax.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ cp -f ${srcdir}/OgreCore.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ - cp -f ${srcdir}/SkyX.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ + # cp -f ${srcdir}/SkyX.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ cp -f ${srcdir}/SO3Deferred.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ cp -f ${srcdir}/SO3SelectionBuffer.zip ${pkgdir}${MINGW_PREFIX}/share/ogitor/Media/packs/ }