diff options
| author | Christian Fetzer <fetzer.ch@googlemail.com> | 2016-02-27 09:42:16 +0100 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@googlemail.com> | 2016-02-27 09:42:16 +0100 |
| commit | b363b7f91521e1b2fe45cabf5b88e8d1c4074ed5 (patch) | |
| tree | d0d733bc3414a0979d51e0a483b8d5f8b8a72c63 /project | |
| parent | b2af4030997bf2ad9a3d56202893124b1adf0f34 (diff) | |
[cmake] Fix Windows build with msys2
This fixes the Windows build after the migration to msys2.
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/modules/FindLibDvd.cmake | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/windows/archsetup.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/project/cmake/modules/FindLibDvd.cmake b/project/cmake/modules/FindLibDvd.cmake index e31e70754a..e33b99724c 100644 --- a/project/cmake/modules/FindLibDvd.cmake +++ b/project/cmake/modules/FindLibDvd.cmake @@ -99,7 +99,7 @@ if(NOT WIN32) set(LIBDVD_FOUND 1 CACHE BOOL "libdvd found" FORCE) else() # Dynamically loaded on Windows - find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h PATHS ${CORE_SOURCE_DIR}/lib/libdvd) + find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h PATHS ${CORE_SOURCE_DIR}/lib/libdvd/include) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LIBDVD REQUIRED_VARS LIBDVD_INCLUDE_DIR) diff --git a/project/cmake/scripts/windows/archsetup.cmake b/project/cmake/scripts/windows/archsetup.cmake index 731f3ecc17..baa3624592 100644 --- a/project/cmake/scripts/windows/archsetup.cmake +++ b/project/cmake/scripts/windows/archsetup.cmake @@ -12,6 +12,8 @@ set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs) set(CMAKE_SYSTEM_NAME Windows) list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${PROJECT_SOURCE_DIR}/../../lib/win32) +list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${PROJECT_SOURCE_DIR}/../../lib/win32/ffmpeg) +list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${PROJECT_SOURCE_DIR}/../../lib/win32/ffmpeg/bin) list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${PROJECT_SOURCE_DIR}/../BuildDependencies) set(CONFIGURATION_LIBDIR lib/${CORE_BUILD_CONFIG}-vc120) set(CONFIGURATION_LIBDIR_RELEASE lib/Release-vc120) @@ -50,7 +52,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") # For #pragma comment(lib X) # TODO: It would certainly be better to handle these libraries via CMake modules. -link_directories(${PROJECT_SOURCE_DIR}/../../lib/win32/ffmpeg/.libs +link_directories(${PROJECT_SOURCE_DIR}/../../lib/win32/ffmpeg/bin ${PROJECT_SOURCE_DIR}/../BuildDependencies/lib ${PROJECT_SOURCE_DIR}/../BuildDependencies/${CONFIGURATION_LIBDIR}) |