move to own git serverHEADmaster

1 files changed, 136 insertions, 0 deletions

diff --git a/vcpkg/ports/ogre-next/toolchain_fixes.patch b/vcpkg/ports/ogre-next/toolchain_fixes.patch
new file mode 100644
index 0000000..6ea38a1
--- /dev/null
+++ b/vcpkg/ports/ogre-next/toolchain_fixes.patch
@@ -0,0 +1,136 @@
+diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
+index 45d5935..cdb097a 100644
+--- a/CMake/CMakeLists.txt
++++ b/CMake/CMakeLists.txt
+@@ -18,6 +18,7 @@ if(WIN32 OR APPLE)
+ else()
+   set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
+ endif()
++set(OGRE_CMAKE_DIR "share/ogre-next")
+ 
+ set(INST_FILES
+   Packages/FindRapidjson.cmake
+diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
+index 9d3b1b2..11fc345 100644
+--- a/CMake/ConfigureBuild.cmake
++++ b/CMake/ConfigureBuild.cmake
+@@ -284,6 +284,11 @@ if (UNIX)
+     # there is no pkgconfig file for freeimage, so we need to add that lib manually
+     set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage")
+     configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
++    if(NOT X11_FOUND)
++      file(READ "${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc" ogre_pc)
++      string(REPLACE ", x11, xt, xaw7, gl" "" ogre_pc "${ogre_pc}")
++      file(WRITE "${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc" "${ogre_pc}")
++    endif()
+   else ()
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
+   endif ()
+diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
+index 53111e0..e0f6716 100644
+--- a/CMake/Utils/FindPkgMacros.cmake
++++ b/CMake/Utils/FindPkgMacros.cmake
+@@ -81,6 +81,12 @@ endmacro (use_pkgconfig)
+ macro(make_library_set PREFIX)
+   if (${PREFIX}_FWK)
+     set(${PREFIX} ${${PREFIX}_FWK})
++  elseif (${PREFIX}_REL OR ${PREFIX}_DBG)
++    include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake")
++    set(${PREFIX}_RELEASE "${${PREFIX}_REL}")
++    set(${PREFIX}_DEBUG "${${PREFIX}_DBG}")
++    string(REPLACE "_LIBRARY" "" PREFIX_BASENAME "${PREFIX}")
++    select_library_configurations(${PREFIX_BASENAME})
+   elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
+     set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
+   elseif (${PREFIX}_REL)
+diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
+index d8e0208..1fdb63c 100644
+--- a/CMake/Utils/OgreConfigTargets.cmake
++++ b/CMake/Utils/OgreConfigTargets.cmake
+@@ -41,7 +41,7 @@ if (NOT OGRE_RUNTIME_OUTPUT)
+   set(OGRE_RUNTIME_OUTPUT ${OGRE_BINARY_DIR}/bin)
+ endif ()
+ 
+-if (WIN32)
++if (0)
+   set(OGRE_RELEASE_PATH "/Release")
+   set(OGRE_RELWDBG_PATH "/RelWithDebInfo")
+   set(OGRE_MINSIZE_PATH "/MinSizeRel")
+@@ -52,7 +52,7 @@ if (WIN32)
+   set(OGRE_LIB_DEBUG_PATH "/Debug")
+   set(OGRE_PLUGIN_PATH "/opt")
+   set(OGRE_SAMPLE_PATH "/opt/samples")
+-elseif (UNIX)
++elseif (1)
+   set(OGRE_RELEASE_PATH "")
+   set(OGRE_RELWDBG_PATH "")
+   set(OGRE_MINSIZE_PATH "")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2786e35..7a92a7b 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -299,7 +299,6 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS)
+     execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
+     string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+   else()
+-    set(CMAKE_OSX_SYSROOT iphoneos)
+   endif()
+ 
+   set(CMAKE_EXE_LINKER_FLAGS "-framework Foundation -framework CoreGraphics -framework QuartzCore -framework UIKit")
+@@ -364,7 +363,6 @@ elseif (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+     execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
+     string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+   else()
+-    set(CMAKE_OSX_SYSROOT macosx)
+   endif()
+ 
+   set( CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES )
+diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
+index b698b84..75fef2c 100644
+--- a/OgreMain/CMakeLists.txt
++++ b/OgreMain/CMakeLists.txt
+@@ -439,7 +439,7 @@ if (APPLE)
+         LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo"
+     )
+ 
+-    set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
++    set(OGRE_OSX_BUILD_CONFIGURATION ".")
+   
+ 	add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD
+ 		COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
+@@ -494,6 +494,9 @@ use_precompiled_header(${OGRE_NEXT}Main
+ )
+ 
+ # install ${OGRE_NEXT}Main
++if(MSVC)
++  set(OGRE_LIB_DIRECTORY lib/manual-link)
++endif()
+ ogre_config_lib(${OGRE_NEXT}Main TRUE)
+ foreach(HEADER_FILE ${HEADER_FILES})
+ 	string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${OGRE_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE})
+diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h
+index 6754c4e..6b1879d 100644
+--- a/OgreMain/include/OgrePlatform.h
++++ b/OgreMain/include/OgrePlatform.h
+@@ -504,7 +504,7 @@ THE SOFTWARE.
+ 
+     // Define whether or not Ogre compiled with NEON support.
+     #if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && \
+-        ( defined(__aarch64__) || defined(__ARM_NEON__) || defined(_WIN32_WINNT_WIN8) && _WIN32_WINNT >= _WIN32_WINNT_WIN8 )
++        ( defined(__aarch64__) || defined(__ARM_NEON__) || defined(_M_ARM64) || defined(_WIN32_WINNT_WIN8) && _WIN32_WINNT >= _WIN32_WINNT_WIN8 )
+         #define __OGRE_HAVE_NEON  1
+     #endif
+ #endif
+diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h
+index 8693c57..b4179ea 100644
+--- a/OgreMain/include/OgreString.h
++++ b/OgreMain/include/OgreString.h
+@@ -222,7 +222,7 @@ namespace Ogre {
+ #   endif
+ #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1600 && OGRE_COMP_VER < 1910 && !defined(STLPORT) // VC++ 10.0
+     typedef ::std::tr1::hash< _StringBase > _StringHash;
+-#elif !defined( _STLP_HASH_FUN_H )
++#elif 0
+     typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash;
+ #else
+     typedef std::hash< _StringBase > _StringHash;