diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-03-28 09:39:36 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-03-28 12:21:45 +0200 |
| commit | 7913be920bebb5edff697274c9065691f9a7ca7a (patch) | |
| tree | aa2d01ddd2e4ec4372ef1049ef3240cc3b88fea6 /project | |
| parent | 1dd48ad668ac2131077b36ae2b4a131124ed0af9 (diff) | |
[cmake] Switch to msbuild instead of devenv for Windows libs
Use msbuild instead of devenv to build cpluff and effects11.
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/modules/FindCpluff.cmake | 6 | ||||
| -rw-r--r-- | project/cmake/modules/FindD3DX11Effects.cmake | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/project/cmake/modules/FindCpluff.cmake b/project/cmake/modules/FindCpluff.cmake index b8fa22d18e..f4a0dc10f0 100644 --- a/project/cmake/modules/FindCpluff.cmake +++ b/project/cmake/modules/FindCpluff.cmake @@ -34,11 +34,9 @@ else() CONFIGURE_COMMAND "" # TODO: Building the project directly from lib/cpluff/libcpluff/win32/cpluff.vcxproj # fails becaue it imports XBMC.defaults.props - BUILD_COMMAND devenv /build ${CORE_BUILD_CONFIG} - ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln - /project cpluff + BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln + /t:cpluff /p:Configuration=${CORE_BUILD_CONFIG} INSTALL_COMMAND "") - # TODO: core_link_library endif() set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include) diff --git a/project/cmake/modules/FindD3DX11Effects.cmake b/project/cmake/modules/FindD3DX11Effects.cmake index 2b2de852bd..9de8c2bc48 100644 --- a/project/cmake/modules/FindD3DX11Effects.cmake +++ b/project/cmake/modules/FindD3DX11Effects.cmake @@ -10,8 +10,8 @@ ExternalProject_Add(d3dx11effects SOURCE_DIR ${CORE_SOURCE_DIR}/lib/win32/Effects11 PREFIX ${CORE_BUILD_DIR}/Effects11 CONFIGURE_COMMAND "" - BUILD_COMMAND devenv /build ${CORE_BUILD_CONFIG} - ${CORE_SOURCE_DIR}/lib/win32/Effects11/Effects11_2013.sln + BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/lib/win32/Effects11/Effects11_2013.sln + /t:Effects11 /p:Configuration=${CORE_BUILD_CONFIG} INSTALL_COMMAND "") set(D3DX11EFFECTS_FOUND 1) |