The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ogre/ogre-next] Add conflict error message (#11325)

Browse Source 
* [ogre/ogre-next] Add conflict error message

* [ogre] Fix build error

* [ogre/ogre-next] Fix deprecated function
This commit is contained in:
Lily 2020-05-16 07:39:54 +08:00 committed by GitHub
parent 184c724033
commit fea5813728
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ogre-next/CONTROL
View File

@ -1,5 +1,5 @@
Source: ogre-next Source: ogre-next
Version: 2019-10-20 Version: 2019-10-20-1
Build-Depends: zlib, freeimage, freetype, rapidjson, openvr, boost-thread, boost-date-time, poco, tbb, sdl2, tinyxml, zziplib Build-Depends: zlib, freeimage, freetype, rapidjson, openvr, boost-thread, boost-date-time, poco, tbb, sdl2, tinyxml, zziplib
Homepage: https://github.com/OGRECave/ogre-next Homepage: https://github.com/OGRECave/ogre-next
Description: Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++ Description: Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++

8
ports/ogre-next/portfile.cmake
View File

@ -1,6 +1,8 @@
# This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile. # This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile.
include(vcpkg_common_functions) if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
endif()
if(NOT VCPKG_TARGET_IS_WINDOWS) if(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") 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")
@ -87,7 +89,7 @@ endif()
#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
#manual-link subfolder is here to the rescue! #manual-link subfolder is here to the rescue!
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@ -114,6 +116,6 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
endif() endif()
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre-next RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

2
ports/ogre/CONTROL
View File

@ -1,5 +1,5 @@
Source: ogre Source: ogre
Version: 1.12.1 Version: 1.12.1-1
Build-Depends: freeimage, freetype, zlib, zziplib Build-Depends: freeimage, freetype, zlib, zziplib
Homepage: https://github.com/OGRECave/ogre Homepage: https://github.com/OGRECave/ogre
Description: 3D Object-Oriented Graphics Rendering Engine Description: 3D Object-Oriented Graphics Rendering Engine

44
ports/ogre/portfile.cmake
View File

@ -1,6 +1,8 @@
include(vcpkg_common_functions) if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
endif()
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(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") 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() endif()
@ -24,29 +26,12 @@ endif()
# Configure features # Configure features
if("d3d9" IN_LIST FEATURES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
set(WITH_D3D9 ON) d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9
else() java OGRE_BUILD_COMPONENT_JAVA
set(WITH_D3D9 OFF) python OGRE_BUILD_COMPONENT_PYTHON
endif() csharp OGRE_BUILD_COMPONENT_CSHARP
)
if("java" IN_LIST FEATURES)
set(WITH_JAVA ON)
else()
set(WITH_JAVA OFF)
endif()
if("python" IN_LIST FEATURES)
set(WITH_PYTHON ON)
else()
set(WITH_PYTHON OFF)
endif()
if("csharp" IN_LIST FEATURES)
set(WITH_CSHARP ON)
else()
set(WITH_CSHARP OFF)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
@ -73,10 +58,7 @@ vcpkg_configure_cmake(
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
-DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
# Optional stuff # Optional stuff
-DOGRE_BUILD_COMPONENT_JAVA=${WITH_JAVA} ${FEATURE_OPTIONS}
-DOGRE_BUILD_COMPONENT_PYTHON=${WITH_PYTHON}
-DOGRE_BUILD_COMPONENT_CSHARP=${WITH_CSHARP}
-DOGRE_BUILD_RENDERSYSTEM_D3D9=${WITH_D3D9}
# vcpkg specific stuff # vcpkg specific stuff
-DOGRE_CMAKE_DIR=share/ogre -DOGRE_CMAKE_DIR=share/ogre
) )
@ -105,7 +87,7 @@ endif()
#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
#manual-link subfolder is here to the rescue! #manual-link subfolder is here to the rescue!
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@ -132,6 +114,6 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
endif() endif()
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()