Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 07:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some minor CMake configuration cleanup, mostly for Windows.

Browse source
This commit is contained in:
Leon Styhre 2022-01-09 23:40:59 +01:00
parent 167ee26fa1
commit 7c640c24bf
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
CMakeLists.txt
View file

@ -357,10 +357,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
endif() endif()
if(RPI_32) if(RPI_32)
list(APPEND COMMON_INCLUDE_DIRS "${CMAKE_FIND_ROOT_PATH}/opt/vc/include" list(APPEND COMMON_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/opt/vc/include
"${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos" ${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos
"${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vmcs_host/linux" ${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vmcs_host/linux
"${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos/pthreads") ${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos/pthreads)
endif() endif()
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
@ -380,39 +380,39 @@ if(APPLE)
${PROJECT_SOURCE_DIR}/libpugixml.a ${PROJECT_SOURCE_DIR}/libpugixml.a
${PROJECT_SOURCE_DIR}/libSDL2-2.0.dylib) ${PROJECT_SOURCE_DIR}/libSDL2-2.0.dylib)
elseif(WIN32) elseif(WIN32)
if(DEFINED MSVC) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(COMMON_LIBRARIES "${PROJECT_SOURCE_DIR}/avcodec.lib" set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec.lib
"${PROJECT_SOURCE_DIR}/avfilter.lib" ${PROJECT_SOURCE_DIR}/avfilter.lib
"${PROJECT_SOURCE_DIR}/avformat.lib" ${PROJECT_SOURCE_DIR}/avformat.lib
"${PROJECT_SOURCE_DIR}/avutil.lib" ${PROJECT_SOURCE_DIR}/avutil.lib
"${PROJECT_SOURCE_DIR}/swresample.lib" ${PROJECT_SOURCE_DIR}/swresample.lib
"${PROJECT_SOURCE_DIR}/swscale.lib" ${PROJECT_SOURCE_DIR}/swscale.lib
"${PROJECT_SOURCE_DIR}/FreeImage.lib" ${PROJECT_SOURCE_DIR}/FreeImage.lib
"${PROJECT_SOURCE_DIR}/glew32.lib" ${PROJECT_SOURCE_DIR}/glew32.lib
"${PROJECT_SOURCE_DIR}/libcurl-x64.lib" ${PROJECT_SOURCE_DIR}/libcurl-x64.lib
"${PROJECT_SOURCE_DIR}/freetype.lib" ${PROJECT_SOURCE_DIR}/freetype.lib
"${PROJECT_SOURCE_DIR}/pugixml.lib" ${PROJECT_SOURCE_DIR}/pugixml.lib
"${PROJECT_SOURCE_DIR}/rlottie.lib" ${PROJECT_SOURCE_DIR}/rlottie.lib
"${PROJECT_SOURCE_DIR}/SDL2main.lib" ${PROJECT_SOURCE_DIR}/SDL2main.lib
"${PROJECT_SOURCE_DIR}/SDL2.lib" ${PROJECT_SOURCE_DIR}/SDL2.lib
"Winmm.dll") Winmm.dll)
else() else()
set(COMMON_LIBRARIES "${PROJECT_SOURCE_DIR}/avcodec-58.dll" set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-58.dll
"${PROJECT_SOURCE_DIR}/avfilter-7.dll" ${PROJECT_SOURCE_DIR}/avfilter-7.dll
"${PROJECT_SOURCE_DIR}/avformat-58.dll" ${PROJECT_SOURCE_DIR}/avformat-58.dll
"${PROJECT_SOURCE_DIR}/avutil-56.dll" ${PROJECT_SOURCE_DIR}/avutil-56.dll
"${PROJECT_SOURCE_DIR}/swresample-3.dll" ${PROJECT_SOURCE_DIR}/swresample-3.dll
"${PROJECT_SOURCE_DIR}/swscale-5.dll" ${PROJECT_SOURCE_DIR}/swscale-5.dll
"${PROJECT_SOURCE_DIR}/FreeImage.dll" ${PROJECT_SOURCE_DIR}/FreeImage.dll
"${PROJECT_SOURCE_DIR}/glew32.dll" ${PROJECT_SOURCE_DIR}/glew32.dll
"${PROJECT_SOURCE_DIR}/libcurl-x64.dll" ${PROJECT_SOURCE_DIR}/libcurl-x64.dll
"${PROJECT_SOURCE_DIR}/libfreetype.dll" ${PROJECT_SOURCE_DIR}/libfreetype.dll
"${PROJECT_SOURCE_DIR}/libpugixml.dll" ${PROJECT_SOURCE_DIR}/libpugixml.dll
"${PROJECT_SOURCE_DIR}/libSDL2main.a" ${PROJECT_SOURCE_DIR}/libSDL2main.a
"${PROJECT_SOURCE_DIR}/librlottie.dll" ${PROJECT_SOURCE_DIR}/librlottie.dll
"${PROJECT_SOURCE_DIR}/SDL2.dll" ${PROJECT_SOURCE_DIR}/SDL2.dll
"mingw32" mingw32
"Winmm.dll") Winmm.dll)
endif() endif()
else() else()
set(COMMON_LIBRARIES ${CURL_LIBRARIES} set(COMMON_LIBRARIES ${CURL_LIBRARIES}