vcpkg/ports/ogre/0001-use-vcpkg-freeimage.patch
2016-12-18 23:00:35 +01:00

18 lines
731 B
Diff

diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
index 6a43378..22f950e 100644
--- a/OgreMain/CMakeLists.txt
+++ b/OgreMain/CMakeLists.txt
@@ -220,7 +220,11 @@ endif ()
list(APPEND HEADER_FILES ${THREAD_HEADER_FILES})
# Add needed definitions and nedmalloc include dir
-add_definitions(-DOGRE_NONCLIENT_BUILD -DFREEIMAGE_LIB -D_MT -D_USRDLL)
+# vcpkg specific patch: we removed -DFREEIMAGE_LIB
+# from the defines, because vcpkg's freeimage can
+# be both static or dynamic, and FREEIMAGE_LIB
+# remove all the symbol exporting declaration from FreeImage.h
+add_definitions(-DOGRE_NONCLIENT_BUILD -D_MT -D_USRDLL)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/nedmalloc)
set(LIBRARIES ${PLATFORM_LIBS})