echoes91
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix VS CMake (#4649) 

Enable multithreaded compilation for VS, prevent it Optimizing the models per-build, fix up the pioneer-thirdparty paths, GLOB the header files, copy the DLLs needed for visual studio, Changed the appveyor MSVC prepare script
master
Andrew Copland 2019-07-29 11:05:42 +01:00 committed by GitHub
parent d72e4e9dc9
commit 3b5bade43b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CI/appveyor/msvc/prepare.sh
View File

@ -3,5 +3,6 @@
# Exit immediately upon error
set -e
cd /c/projects/pioneer
cd /c/projects
git clone --depth 1 git://github.com/pioneerspacesim/pioneer-thirdparty
cd /c/projects/pioneer

18
CMakeLists.txt
View File

@ -29,6 +29,9 @@ if (MSVC)
# Use M_PI/M_E macros from math.h
add_definitions(-D_USE_MATH_DEFINES -DHAVE_M_PI)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif (MSVC)
if (APPLE)
@ -105,6 +108,8 @@ list(APPEND SRC_FOLDERS
)
foreach (each IN LISTS SRC_FOLDERS)
file(GLOB header_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${each}/*.h)
list(APPEND HXX_FILES ${header_files})
file(GLOB src_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${each}/*.cpp)
list(APPEND CXX_FILES ${src_files})
endforeach (each IN LISTS SRC_FOLDERS)
@ -216,7 +221,7 @@ if (NOT USE_SYSTEM_LIBLUA)
include_directories(contrib/lua)
endif (NOT USE_SYSTEM_LIBLUA)
add_library(pioneerLib STATIC ${CXX_FILES})
add_library(pioneerLib STATIC ${CXX_FILES} ${HXX_FILES})
if (WIN32)
string(TIMESTAMP BUILD_YEAR "%Y")
@ -284,6 +289,15 @@ set_target_properties(${PROJECT_NAME} modelcompiler savegamedump pioneerLib PROP
CXX_EXTENSIONS ON
)
if(MSVC)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND xcopy ..\\pioneer-thirdparty\\win32\\bin\\x64\\vs2017\\*.dll $(TargetDir)*.dll /Y /C
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "copy the dlls into the directory"
VERBATIM
)
endif(MSVC)
if (CMAKE_CROSSCOMPILING)
find_program(MODELCOMPILER modelcompiler DOC "modelcompiler executable for the host")
else (CMAKE_CROSSCOMPILING)
@ -293,11 +307,13 @@ endif (CMAKE_CROSSCOMPILING)
if (MODELCOMPILER)
# Optimize the models.
# This really shouldn't be done inside the source tree...
if (NOT MSVC)
add_custom_command(TARGET modelcompiler POST_BUILD
COMMAND ${CMAKE_COMMAND} -E env SDL_VIDEODRIVER=dummy ${MODELCOMPILER} -b inplace
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "Optimizing models" VERBATIM
)
endif (NOT MSVC)
else (MODELCOMPILER)
message(WARNING "No modelcompiler provided, models won't be optimized!")
endif(MODELCOMPILER)

24
msvc-defaults.cmake
View File

@ -1,17 +1,17 @@
set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/include/freetype)
set(FREETYPE_LIBRARY ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/freetype271MT.lib)
set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include/freetype)
set(FREETYPE_LIBRARY ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/freetype271MT.lib)
set(SDL2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/include)
set(SDL2_LIBRARIES ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/SDL2.lib;${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/SDL2main.lib)
set(SDL2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include)
set(SDL2_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/SDL2.lib;${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/SDL2main.lib)
set(SDL2_IMAGE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/include)
set(SDL2_IMAGE_LIBRARIES ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/SDL2_image.lib)
set(SDL2_IMAGE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include)
set(SDL2_IMAGE_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/SDL2_image.lib)
set(ASSIMP_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/include)
set(ASSIMP_LIBRARIES ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/assimp-vc141-mt.lib)
set(ASSIMP_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include)
set(ASSIMP_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/assimp-vc141-mt.lib)
set(VORBISFILE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/include)
set(VORBISFILE_LIBRARIES ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/libogg_static.lib;${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/libvorbis_static.lib;${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/libvorbisfile_static.lib)
set(VORBISFILE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include)
set(VORBISFILE_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/libogg_static.lib;${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/libvorbis_static.lib;${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/libvorbisfile_static.lib)
set(SIGCPP_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/include/sigc++-2.0)
set(SIGCPP_LIBRARIES ${CMAKE_SOURCE_DIR}/pioneer-thirdparty/win32/lib/x64/vs2017/sigc-vc140-2_0.lib)
set(SIGCPP_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include/sigc++-2.0)
set(SIGCPP_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/x64/vs2017/sigc-vc140-2_0.lib)