Ensure SFML dependencies dlls and wxWidgets dlls are copied when building for Windows.

This commit is contained in:
Florian Rival
2015-01-26 22:29:30 +01:00
parent 6043e22633
commit a289f05a4c
3 changed files with 15 additions and 4 deletions

View File

@@ -141,7 +141,7 @@ ELSE()
IF(WIN32)
add_custom_command(TARGET GDIDE
POST_BUILD
COMMAND "${GD_base_dir}/IDE/scripts/copyWindowsLibraries.bat" "${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}" "${CMAKE_BINARY_DIR}/ExtLibs/SFML/lib"
COMMAND "${GD_base_dir}/IDE/scripts/copyWindowsLibraries.bat" "${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}" "${CMAKE_BINARY_DIR}/ExtLibs/"
WORKING_DIRECTORY ${GD_base_dir}/IDE/scripts)
ELSE()
#Extra files (icons, examples, game templates, translations...) are stored in the Release_Windows
@@ -162,7 +162,7 @@ ENDIF()
IF(NOT WIN32)
install(DIRECTORY ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}/ DESTINATION "${GD_INSTALL_PREFIX}")
install(FILES ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}/GDIDE DESTINATION "${GD_INSTALL_PREFIX}" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ )
install(FILES ${GD_base_dir}/Binaries/Packaging/linux-extra-files/usr/share/applications/gdevelop.desktop DESTINATION /usr/share/applications/ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ )
install(DIRECTORY ${GD_base_dir}/Binaries/Packaging/linux-extra-files/usr/share/icons/ DESTINATION /usr/share/icons/)
install(DIRECTORY ${GD_base_dir}/Binaries/Packaging/linux-extra-files/usr/share/mime/ DESTINATION /usr/share/mime/)

View File

@@ -1,3 +1,14 @@
::SFML
echo "Copying SFML files to " %1 "..."
xcopy "%2"\*.dll "%1"\*.dll /D /Y /Q
xcopy "%2"\*.a "%1"\*.a /D /Y /Q
echo xcopy "%2"\SFML\lib\*.dll "%1"\*.dll
xcopy "%2"\SFML\lib\*.dll "%1"\*.dll /D /Y /Q
xcopy "%2"\SFML\lib\*.a "%1"\*.a /D /Y /Q
::SFML dependencies
set SFML_DIR=../../ExtLibs/SFML
xcopy "%SFML_DIR%"\extlibs\bin\x86\*.dll "%1"\*.dll /D /Y /Q
::wxWidgets
echo "Copying wxWidgets files to " %1 "..."
set WX_LIB_DIR=../../ExtLibs/wxwidgets
xcopy "%WX_LIB_DIR%"\lib\gcc_dll\*.dll "%1"\*.dll /D /Y /Q