mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[ogre-next] Fixup 2.3.3 (#35344)
This commit is contained in:
Kai Pastor
GitHub
parent
1b3128686a
commit
04f7d34c26
@ -40,11 +40,16 @@ vcpkg_cmake_configure(
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glslang DO_NOT_DELETE_PARENT_CONFIG_PATH)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/glslang-config.cmake"
|
||||
"${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake"
|
||||
"${PACKAGE_PREFIX_DIR}/share/${PORT}/glslang-targets.cmake"
|
||||
[[${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake]]
|
||||
[[${CMAKE_CURRENT_LIST_DIR}/glslang-targets.cmake]]
|
||||
)
|
||||
file(REMOVE_RECURSE CONFIG_PATH "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Public/ShaderLang.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Include/glslang_c_interface.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1")
|
||||
endif()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "glslang",
|
||||
"version": "13.1.1",
|
||||
"port-version": 1,
|
||||
"description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
|
||||
"homepage": "https://github.com/KhronosGroup/glslang",
|
||||
"license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",
|
||||
|
||||
@ -1,7 +1,37 @@
|
||||
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
||||
index cdb097a..967d33b 100644
|
||||
--- a/CMake/CMakeLists.txt
|
||||
+++ b/CMake/CMakeLists.txt
|
||||
@@ -21,9 +21,7 @@ endif()
|
||||
set(OGRE_CMAKE_DIR "share/ogre-next")
|
||||
|
||||
set(INST_FILES
|
||||
- Packages/FindRapidjson.cmake
|
||||
Packages/FindRemotery.cmake
|
||||
- Packages/FindSDL2.cmake
|
||||
Packages/FindOGRE.cmake
|
||||
Utils/FindPkgMacros.cmake
|
||||
Utils/MacroLogFeature.cmake
|
||||
@@ -45,12 +43,8 @@ endif ()
|
||||
|
||||
set(STATIC_INST_FILES
|
||||
Packages/FindDirectX.cmake
|
||||
- Packages/FindFreeImage.cmake
|
||||
- Packages/FindFreetype.cmake
|
||||
Packages/FindOpenGLES.cmake
|
||||
Packages/FindOpenGLES2.cmake
|
||||
- Packages/FindZLIB.cmake
|
||||
- Packages/FindZZip.cmake
|
||||
Packages/FindSoftimage.cmake
|
||||
)
|
||||
if (WIN32)
|
||||
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
||||
index 74cb0f4..2cad26a 100644
|
||||
--- a/CMake/Dependencies.cmake
|
||||
+++ b/CMake/Dependencies.cmake
|
||||
@@ -76,17 +76,20 @@
|
||||
@@ -74,21 +74,24 @@ set(CMAKE_FRAMEWORK_PATH ${OGRE_DEP_SEARCH_PATH} ${CMAKE_FRAMEWORK_PATH})
|
||||
#######################################################################
|
||||
|
||||
# Find zlib
|
||||
-find_package(ZLIB)
|
||||
+find_package(ZLIB REQUIRED)
|
||||
@ -26,81 +56,14 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
||||
+find_package(FREETYPE NAMES freetype REQUIRED)
|
||||
+set(FREETYPE_LIBRARIES freetype)
|
||||
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
|
||||
@@ -107,3 +111,3 @@
|
||||
|
||||
find_package(Vulkan)
|
||||
@@ -105,7 +108,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN)
|
||||
endif ()
|
||||
|
||||
# Find rapidjson
|
||||
-find_package(Rapidjson)
|
||||
+find_package(Rapidjson NAMES RapidJSON CONFIG REQUIRED)
|
||||
macro_log_feature(Rapidjson_FOUND "rapidjson" "C++ JSON parser" "https://rapidjson.org/" FALSE "" "")
|
||||
@@ -257,3 +261,3 @@
|
||||
# ThreadingBuildingBlocks
|
||||
-find_package(TBB)
|
||||
+find_package(TBB CONFIG REQUIRED)
|
||||
macro_log_feature(TBB_FOUND "tbb" "Threading Building Blocks" "http://www.threadingbuildingblocks.org/" FALSE "" "")
|
||||
@@ -279,5 +283,5 @@
|
||||
# Find sdl2
|
||||
-find_package(SDL2)
|
||||
+find_package(SDL2 CONFIG REQUIRED)
|
||||
macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "")
|
||||
|
||||
#######################################################################
|
||||
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
||||
--- a/CMake/CMakeLists.txt
|
||||
+++ b/CMake/CMakeLists.txt
|
||||
@@ -21,9 +21,7 @@
|
||||
|
||||
set(INST_FILES
|
||||
- Packages/FindRapidjson.cmake
|
||||
Packages/FindRemotery.cmake
|
||||
- Packages/FindSDL2.cmake
|
||||
Packages/FindOGRE.cmake
|
||||
Utils/FindPkgMacros.cmake
|
||||
Utils/MacroLogFeature.cmake
|
||||
Utils/PreprocessorUtils.cmake
|
||||
@@ -37,18 +35,12 @@
|
||||
if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco")
|
||||
set(INST_FILES ${INST_FILES} Packages/FindPOCO.cmake)
|
||||
endif ()
|
||||
|
||||
-if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "tbb")
|
||||
- set(INST_FILES ${INST_FILES} Packages/FindTBB.cmake)
|
||||
-endif ()
|
||||
|
||||
+
|
||||
set(STATIC_INST_FILES
|
||||
Packages/FindDirectX.cmake
|
||||
- Packages/FindFreeImage.cmake
|
||||
- Packages/FindFreetype.cmake
|
||||
Packages/FindOpenGLES.cmake
|
||||
Packages/FindOpenGLES2.cmake
|
||||
- Packages/FindZLIB.cmake
|
||||
- Packages/FindZZip.cmake
|
||||
Packages/FindSoftimage.cmake
|
||||
)
|
||||
diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindZLIB.cmake
|
||||
rename to CMake/Packages/FindZLIB_NOTUSE.cmake
|
||||
diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindZZip.cmake
|
||||
rename to CMake/Packages/FindZZip_NOTUSE.cmake
|
||||
diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindFreeImage.cmake
|
||||
rename to CMake/Packages/FindFreeImage_NOTUSE.cmake
|
||||
diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindFreetype.cmake
|
||||
rename to CMake/Packages/FindFreetype_NOTUSE.cmake
|
||||
diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindSDL2.cmake
|
||||
rename to CMake/Packages/FindSDL2_NOTUSE.cmake
|
||||
diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindTBB.cmake
|
||||
rename to CMake/Packages/FindTBB_NOTUSE.cmake
|
||||
diff --git a/CMake/Packages/FindRapidjson.cmake b/CMake/Packages/FindRapidjson_NOTUSE.cmake
|
||||
similarity index 100%
|
||||
rename from CMake/Packages/FindRapidjson.cmake
|
||||
rename to CMake/Packages/FindRapidjson_NOTUSE.cmake
|
||||
find_package(RenderDoc)
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h
|
||||
index 8693c57..720a243 100644
|
||||
--- a/OgreMain/include/OgreString.h
|
||||
+++ b/OgreMain/include/OgreString.h
|
||||
@@ -34,44 +34,6 @@ THE SOFTWARE.
|
||||
|
||||
#include "OgreHeaderPrefix.h"
|
||||
|
||||
-// If we're using the GCC 3.1 C++ Std lib
|
||||
-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
|
||||
-
|
||||
-// For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
|
||||
-# if __cplusplus >= 201103L
|
||||
-# include <unordered_map>
|
||||
-# elif OGRE_COMP_VER >= 430
|
||||
-# include <tr1/unordered_map>
|
||||
-# else
|
||||
-# include <ext/hash_map>
|
||||
-namespace __gnu_cxx
|
||||
-{
|
||||
- template <> struct hash< Ogre::_StringBase >
|
||||
- {
|
||||
- size_t operator()( const Ogre::_StringBase _stringBase ) const
|
||||
- {
|
||||
- /* This is the PRO-STL way, but it seems to cause problems with VC7.1
|
||||
- and in some other cases (although I can't recreate it)
|
||||
- hash<const char*> H;
|
||||
- return H(_stringBase.c_str());
|
||||
- */
|
||||
- /** This is our custom way */
|
||||
- register size_t ret = 0;
|
||||
- for( Ogre::_StringBase::const_iterator it = _stringBase.begin(); it != _stringBase.end(); ++it )
|
||||
- ret = 5 * ret + *it;
|
||||
-
|
||||
- return ret;
|
||||
- }
|
||||
- };
|
||||
-}
|
||||
-# endif
|
||||
-
|
||||
-#endif
|
||||
-
|
||||
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
|
||||
- #include <xhash>
|
||||
-#endif
|
||||
-
|
||||
namespace Ogre {
|
||||
/** \addtogroup Core
|
||||
* @{
|
||||
@@ -205,28 +167,8 @@ namespace Ogre {
|
||||
static const String replaceAll(const String& source, const String& replaceWhat, const String& replaceWithWhat);
|
||||
};
|
||||
|
||||
+ typedef ::std::hash<_StringBase> _StringHash;
|
||||
|
||||
-#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
|
||||
-# if __cplusplus >= 201103L
|
||||
- typedef std::hash< _StringBase > _StringHash;
|
||||
-# elif OGRE_COMP_VER < 430
|
||||
- typedef ::__gnu_cxx::hash< _StringBase > _StringHash;
|
||||
-# else
|
||||
- typedef ::std::tr1::hash< _StringBase > _StringHash;
|
||||
-# endif
|
||||
-#elif OGRE_COMPILER == OGRE_COMPILER_CLANG
|
||||
-# if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
|
||||
- typedef ::std::hash< _StringBase > _StringHash;
|
||||
-# else
|
||||
- typedef ::std::tr1::hash< _StringBase > _StringHash;
|
||||
-# 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 )
|
||||
- typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash;
|
||||
-#else
|
||||
- typedef std::hash< _StringBase > _StringHash;
|
||||
-#endif
|
||||
/** @} */
|
||||
/** @} */
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -29,3 +29,3 @@
|
||||
endif()
|
||||
-
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
# Use relative paths
|
||||
@@ -387,3 +387,3 @@
|
||||
else()
|
||||
- set(CMAKE_OSX_SYSROOT macosx)
|
||||
+ # set(CMAKE_OSX_SYSROOT macosx)
|
||||
endif()
|
||||
@ -1,4 +1,4 @@
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
if(NOT VCPKG_TARGET_IS_IOS AND NOT VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev")
|
||||
endif()
|
||||
|
||||
@ -11,132 +11,91 @@ vcpkg_from_github(
|
||||
PATCHES
|
||||
toolchain_fixes.patch
|
||||
avoid-name-clashes.patch
|
||||
fix-error-c2039.patch
|
||||
fix-dependencies.patch
|
||||
osx.patch
|
||||
)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
set(OGRE_STATIC ON)
|
||||
else()
|
||||
set(OGRE_STATIC OFF)
|
||||
endif()
|
||||
file(REMOVE
|
||||
"${SOURCE_PATH}/CMake/Packages/FindFreeImage.cmake"
|
||||
"${SOURCE_PATH}/CMake/Packages/FindFreetype.cmake"
|
||||
"${SOURCE_PATH}/CMake/Packages/FindRapidjson.cmake"
|
||||
"${SOURCE_PATH}/CMake/Packages/FindVulkan.cmake"
|
||||
"${SOURCE_PATH}/CMake/Packages/FindZLIB.cmake"
|
||||
"${SOURCE_PATH}/CMake/Packages/FindZZip.cmake"
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
d3d11 OGRE_BUILD_RENDERSYSTEM_DirectX11
|
||||
d3d11 CMAKE_REQUIRE_FIND_PACKAGE_DirectX11
|
||||
gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS
|
||||
gl3plus CMAKE_REQUIRE_FIND_PACKAGE_OpenGL
|
||||
metal OGRE_BUILD_RENDERSYSTEM_METAL
|
||||
planar-reflections OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS
|
||||
vulkan OGRE_BUILD_RENDERSYSTEM_VULKAN
|
||||
vulkan CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC)
|
||||
|
||||
vcpkg_find_acquire_program(PKGCONFIG)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
-DCMAKE_CXX_STANDARD=11
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_AMDAGS=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_GLSLOptimizer=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_HLSL2GLSL=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_OpenVR=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_POCO=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Remotery=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_RenderDoc=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Softimage=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_TBB=ON
|
||||
-DCMAKE_POLICY_DEFAULT_CMP0072=NEW # Prefer GLVND
|
||||
-DOGRE_ARCHIVE_OUTPUT=lib
|
||||
-DOGRE_LIBRARY_OUTPUT=lib
|
||||
-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF
|
||||
-DOGRE_COPY_DEPENDENCIES=OFF
|
||||
-DOGRE_BUILD_MSVC_MP=ON
|
||||
-DOGRE_BUILD_MSVC_ZM=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
|
||||
-DOGRE_BUILD_SAMPLES2=OFF
|
||||
-DOGRE_BUILD_TESTS=OFF
|
||||
-DOGRE_BUILD_TOOLS=OFF
|
||||
-DOGRE_BUILD_MSVC_MP=ON
|
||||
-DOGRE_BUILD_MSVC_ZM=ON
|
||||
-DOGRE_COPY_DEPENDENCIES=OFF
|
||||
-DOGRE_INSTALL_DEPENDENCIES=OFF
|
||||
-DOGRE_INSTALL_DOCS=OFF
|
||||
-DOGRE_INSTALL_PDB=OFF
|
||||
-DOGRE_INSTALL_SAMPLES=OFF
|
||||
-DOGRE_INSTALL_TOOLS=OFF
|
||||
-DOGRE_INSTALL_VSPROPS=OFF
|
||||
-DOGRE_SKIP_BOOST_SEARCHING=ON
|
||||
-DOGRE_STATIC=${OGRE_STATIC}
|
||||
-DOGRE_CONFIG_THREAD_PROVIDER=std
|
||||
-DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GL=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
|
||||
-DOGRE_CMAKE_DIR=share/ogre-next
|
||||
-DOGRE_USE_NEW_PROJECT_NAME=ON
|
||||
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
CMAKE_DISABLE_FIND_PACKAGE_AMDAGS
|
||||
CMAKE_REQUIRE_FIND_PACKAGE_DirectX11
|
||||
OGRE_BUILD_MSVC_MP
|
||||
OGRE_BUILD_MSVC_ZM
|
||||
OGRE_BUILD_RENDERSYSTEM_DirectX11
|
||||
OGRE_COPY_DEPENDENCIES
|
||||
OGRE_INSTALL_DEPENDENCIES
|
||||
OGRE_INSTALL_VSPROPS
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg")
|
||||
if(REL_CFGS)
|
||||
file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(REMOVE ${REL_CFGS})
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
|
||||
vcpkg_fixup_pkgconfig()
|
||||
endif()
|
||||
|
||||
file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg")
|
||||
if(DBG_CFGS)
|
||||
file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
file(REMOVE ${DBG_CFGS})
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
#Remove OgreNextMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
|
||||
#manual-link subfolder is here to the rescue!
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMain.lib")
|
||||
else()
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMainStatic.lib")
|
||||
endif()
|
||||
file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*")
|
||||
file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*")
|
||||
file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/")
|
||||
endif()
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMain_d.lib")
|
||||
else()
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMainStatic_d.lib")
|
||||
endif()
|
||||
file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*")
|
||||
file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*")
|
||||
file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/")
|
||||
endif()
|
||||
|
||||
file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake")
|
||||
foreach(SHARE_FILE ${SHARE_FILES})
|
||||
file(READ "${SHARE_FILE}" _contents)
|
||||
string(REPLACE "lib/OgreNextMain" "lib/manual-link/OgreNextMain" _contents "${_contents}")
|
||||
file(WRITE "${SHARE_FILE}" "${_contents}")
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
# Handle copyright
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/")
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
|
||||
file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*")
|
||||
file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*")
|
||||
file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/")
|
||||
endif()
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug")
|
||||
file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*")
|
||||
file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*")
|
||||
file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
||||
@ -1,165 +1,136 @@
|
||||
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
||||
index 45d5935..cdb097a 100644
|
||||
--- a/CMake/CMakeLists.txt
|
||||
+++ b/CMake/CMakeLists.txt
|
||||
@@ -13,8 +13,10 @@
|
||||
# directory, but can also be used for custom projects.
|
||||
#############################################################
|
||||
|
||||
-if(WIN32 OR APPLE)
|
||||
- set(OGRE_CMAKE_DIR "CMake")
|
||||
-else()
|
||||
- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
|
||||
+if(NOT DEFINED OGRE_CMAKE_DIR)
|
||||
+ if(WIN32 OR APPLE)
|
||||
+ set(OGRE_CMAKE_DIR "CMake")
|
||||
+ else()
|
||||
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
|
||||
+ endif()
|
||||
@@ -18,6 +18,7 @@ if(WIN32 OR APPLE)
|
||||
else()
|
||||
set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
|
||||
endif()
|
||||
diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
|
||||
index dd4b179..6f158fc 100644
|
||||
--- a/CMake/Packages/FindGLSLOptimizer.cmake
|
||||
+++ b/CMake/Packages/FindGLSLOptimizer.cmake
|
||||
@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer)
|
||||
find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer)
|
||||
find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
-make_library_set(GLSL_Optimizer_LIBRARY)
|
||||
+make_library_set(GLSL_Optimizer)
|
||||
|
||||
findpkg_finish(GLSL_Optimizer)
|
||||
add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR)
|
||||
diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake
|
||||
index 7125895..13a306f 100644
|
||||
--- a/CMake/Packages/FindHLSL2GLSL.cmake
|
||||
+++ b/CMake/Packages/FindHLSL2GLSL.cmake
|
||||
@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL)
|
||||
find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL)
|
||||
find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
-make_library_set(HLSL2GLSL_LIBRARY)
|
||||
+make_library_set(HLSL2GLSL)
|
||||
|
||||
findpkg_finish(HLSL2GLSL)
|
||||
add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR)
|
||||
diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake
|
||||
index 95c70cd..893ce01 100644
|
||||
--- a/CMake/Packages/FindNVAPI.cmake
|
||||
+++ b/CMake/Packages/FindNVAPI.cmake
|
||||
@@ -44,7 +44,7 @@ findpkg_framework(NVAPI)
|
||||
find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
|
||||
find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
|
||||
find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
|
||||
-make_library_set(NVAPI_LIBRARY)
|
||||
+make_library_set(NVAPI)
|
||||
|
||||
findpkg_finish(NVAPI)
|
||||
add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
|
||||
\ No newline at end of file
|
||||
diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake
|
||||
index 6b6d7fa..3667b8b 100644
|
||||
--- a/CMake/Packages/FindPOCO.cmake
|
||||
+++ b/CMake/Packages/FindPOCO.cmake
|
||||
@@ -50,7 +50,7 @@ findpkg_framework(POCO)
|
||||
find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
|
||||
find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_LIBRARY)
|
||||
+make_library_set(POCO)
|
||||
|
||||
findpkg_finish(POCO)
|
||||
|
||||
@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES)
|
||||
find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include)
|
||||
find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_Util_LIBRARY)
|
||||
+make_library_set(POCO_Util)
|
||||
findpkg_finish(POCO_Util)
|
||||
|
||||
# Look for Poco's Net package
|
||||
@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES)
|
||||
find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include)
|
||||
find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_Net_LIBRARY)
|
||||
+make_library_set(POCO_Net)
|
||||
findpkg_finish(POCO_Net)
|
||||
|
||||
# Look for Poco's NetSSL package
|
||||
@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES)
|
||||
find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include)
|
||||
find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_NetSSL_LIBRARY)
|
||||
+make_library_set(POCO_NetSSL)
|
||||
findpkg_finish(POCO_NetSSL)
|
||||
|
||||
# Look for Poco's XML package
|
||||
@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
|
||||
find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
|
||||
find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_XML_LIBRARY)
|
||||
+make_library_set(POCO_XML)
|
||||
findpkg_finish(POCO_XML)
|
||||
+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..8dffbbc 100644
|
||||
index 53111e0..e0f6716 100644
|
||||
--- a/CMake/Utils/FindPkgMacros.cmake
|
||||
+++ b/CMake/Utils/FindPkgMacros.cmake
|
||||
@@ -79,15 +79,21 @@ endmacro (use_pkgconfig)
|
||||
|
||||
# Couple a set of release AND debug libraries (or frameworks)
|
||||
@@ -81,6 +81,12 @@ endmacro (use_pkgconfig)
|
||||
macro(make_library_set PREFIX)
|
||||
- if (${PREFIX}_FWK)
|
||||
- set(${PREFIX} ${${PREFIX}_FWK})
|
||||
- elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
|
||||
- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
|
||||
- elseif (${PREFIX}_REL)
|
||||
- set(${PREFIX} ${${PREFIX}_REL})
|
||||
- elseif (${PREFIX}_DBG)
|
||||
- set(${PREFIX} ${${PREFIX}_DBG})
|
||||
- endif ()
|
||||
+ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
|
||||
+ set(PREFIX_LIB "${PREFIX}_LIBRARY")
|
||||
+ if (${PREFIX_LIB}_FWK)
|
||||
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK})
|
||||
+ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG)
|
||||
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "")
|
||||
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "")
|
||||
+ select_library_configurations(${PREFIX})
|
||||
+ elseif (${PREFIX_LIB}_REL)
|
||||
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL})
|
||||
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL})
|
||||
+ elseif (${PREFIX_LIB}_DBG)
|
||||
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG})
|
||||
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG})
|
||||
+ endif()
|
||||
endmacro(make_library_set)
|
||||
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 ()
|
||||
|
||||
# Generate debug names from given release names
|
||||
-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 48af55b..b18ac57 100644
|
||||
index 2786e35..7a92a7b 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS)
|
||||
|
||||
# Set build variables
|
||||
set(XCODE_ATTRIBUTE_SDKROOT iphoneos)
|
||||
- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
|
||||
+ if(1)
|
||||
@@ -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
|
||||
@@ -438,7 +438,5 @@ if (APPLE)
|
||||
set_target_properties(${OGRE_NEXT}Main PROPERTIES
|
||||
@@ -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;
|
||||
|
||||
@ -1,23 +1,18 @@
|
||||
{
|
||||
"name": "ogre-next",
|
||||
"version": "2.3.3",
|
||||
"description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++",
|
||||
"port-version": 1,
|
||||
"description": "Ogre Next - scene-oriented, flexible 3D engine written in C++",
|
||||
"homepage": "https://github.com/OGRECave/ogre-next",
|
||||
"license": "MIT",
|
||||
"supports": "!emscripten & !uwp & !xbox",
|
||||
"dependencies": [
|
||||
"boost-date-time",
|
||||
"boost-thread",
|
||||
"freeimage",
|
||||
"freetype",
|
||||
{
|
||||
"name": "openvr",
|
||||
"platform": "!osx"
|
||||
"name": "freetype",
|
||||
"default-features": false
|
||||
},
|
||||
"pkgconf",
|
||||
"poco",
|
||||
"rapidjson",
|
||||
"sdl2",
|
||||
"tbb",
|
||||
"tinyxml",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
@ -30,9 +25,46 @@
|
||||
"zlib",
|
||||
"zziplib"
|
||||
],
|
||||
"default-features": [
|
||||
{
|
||||
"name": "d3d11",
|
||||
"platform": "windows"
|
||||
},
|
||||
{
|
||||
"name": "gl3plus",
|
||||
"platform": "!android & !ios & !osx & !windows"
|
||||
},
|
||||
{
|
||||
"name": "metal",
|
||||
"platform": "ios | osx"
|
||||
},
|
||||
{
|
||||
"name": "vulkan",
|
||||
"platform": "android"
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"d3d11": {
|
||||
"description": "Direct3D 11 render system",
|
||||
"supports": "windows"
|
||||
},
|
||||
"gl3plus": {
|
||||
"description": "OpenGL 3+ render system",
|
||||
"supports": "!android & !(arm & windows)"
|
||||
},
|
||||
"metal": {
|
||||
"description": "Metal render system",
|
||||
"supports": "osx | ios"
|
||||
},
|
||||
"planar-reflections": {
|
||||
"description": "Component to use planar reflections, can be used by both HlmsPbs and HlmsUnlit"
|
||||
},
|
||||
"vulkan": {
|
||||
"description": "Vulkan render system",
|
||||
"dependencies": [
|
||||
"glslang",
|
||||
"vulkan"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3030,7 +3030,7 @@
|
||||
},
|
||||
"glslang": {
|
||||
"baseline": "13.1.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"glui": {
|
||||
"baseline": "2019-11-30",
|
||||
@ -6162,7 +6162,7 @@
|
||||
},
|
||||
"ogre-next": {
|
||||
"baseline": "2.3.3",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"ois": {
|
||||
"baseline": "1.5.1",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "4a5fb278065c7505c6c2814d8dab0bba3642f194",
|
||||
"version": "13.1.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "8296ce09ec51c8495a5bec8d65445b681df27b74",
|
||||
"version": "13.1.1",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "92372bf7078f6e5f955072f35696788f09849b71",
|
||||
"version": "2.3.3",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "ecf4c650a53fe5d7427f5fcb1e28302d42aad2c7",
|
||||
"version": "2.3.3",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user