ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-23 07:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Visual Studio 2017 support

Browse Source 
Move icons out of main dir
This commit is contained in:
Cong
2017-03-23 21:57:16 +11:00
parent 1915a9782a
commit 2a5404b632
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -60,6 +60,7 @@ Win32/
*.ilk
*.pdb
*.VC.*
.vs/
# MinGW
stdout.txt

11
CMakeLists.txt
View File

@@ -196,7 +196,6 @@ INSTALL(DIRECTORY
${CMAKE_SOURCE_DIR}/sounds
DESTINATION ${DATA_INSTALL_DIR})
INSTALL(FILES
${CMAKE_SOURCE_DIR}/cdogs_icon.bmp
${CMAKE_SOURCE_DIR}/README.md
DESTINATION ${DATA_INSTALL_DIR})
IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
@@ -229,9 +228,9 @@ SET(CPACK_PACKAGE_EXECUTABLES "cdogs-sdl;C-Dogs SDL;cdogs-sdl-editor;Campaign Ed
if(WIN32)
SET(CPACK_GENERATOR NSIS)
SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/doc/COPYING.GPL)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/doc/COPYING.GPL)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "C-Dogs SDL")
SET(CPACK_NSIS_MUI_ICON ${CMAKE_CURRENT_BINARY_DIR}/cdogs-icon.ico)
SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/build/windows/cdogs-icon.ico)
set(CPACK_NSIS_CREATE_ICONS "SetOutPath '\$INSTDIR\\\\bin'
CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\C-Dogs SDL.lnk' '\$INSTDIR\\\\bin\\\\cdogs-sdl.exe'
CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Campaign Editor.lnk' '\$INSTDIR\\\\bin\\\\cdogs-sdl-editor.exe'")
@@ -243,11 +242,11 @@ elseif(APPLE)
set(CPACK_DMG_VOLUME_NAME "C-Dogs SDL")
set(CPACK_SYSTEM_NAME "OSX")
set(CPACK_PACKAGE_ICON
"${CMAKE_CURRENT_BINARY_DIR}/build/macosx/cdogs-icon.icns")
"${CMAKE_SOURCE_DIR}/build/macosx/cdogs-icon.icns")
set(CPACK_DMG_BACKGROUND_IMAGE
"${CMAKE_CURRENT_BINARY_DIR}/build/macosx/dmg_bg.png")
"${CMAKE_SOURCE_DIR}/build/macosx/dmg_bg.png")
set(CPACK_DMG_DS_STORE
"${CMAKE_CURRENT_BINARY_DIR}/build/macosx/DS_Store")
"${CMAKE_SOURCE_DIR}/build/macosx/DS_Store")
# copy SDL frameworks
set(APPS cdogs-sdl cdogs-sdl-editor)

1
build/gcw-zero/make_opk.sh
View File

@@ -23,7 +23,6 @@ cdogsdata="${cdogsdata} ${datadir}/graphics"
cdogsdata="${cdogsdata} ${datadir}/missions"
cdogsdata="${cdogsdata} ${datadir}/music"
cdogsdata="${cdogsdata} ${datadir}/sounds"
cdogsdata="${cdogsdata} ${datadir}/cdogs_icon.bmp"
gcwzdata="${mydir}/default.gcw0.desktop"
gcwzdata="${gcwzdata} ${mydir}/readme_gcw.txt"

BIN
cdogs-icon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

0
cdogs_icon.bmp → graphics/cdogs_icon.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

4
src/CMakeLists.txt
View File

@@ -58,6 +58,8 @@ if(APPLE)
MACOSX_RPATH 1
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@loader_path/../Frameworks")
elseif(MSVC)
set_target_properties(cdogs-sdl PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src")
endif()
target_link_libraries(cdogs-sdl cdogs ${EXTRA_LIBRARIES})
@@ -76,5 +78,7 @@ if(APPLE)
MACOSX_RPATH 1
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@loader_path/../Frameworks")
elseif(MSVC)
set_target_properties(cdogs-sdl-editor PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src")
endif()
target_link_libraries(cdogs-sdl-editor cdogsedlib cdogs ${OPENGL_LIBRARIES} ${EXTRA_LIBRARIES})

2
src/cdogs/grafx.c
View File

@@ -186,7 +186,7 @@ void GraphicsInitialize(GraphicsDevice *g)
if (!g->IsWindowInitialized)
{
char buf[CDOGS_PATH_MAX];
GetDataFilePath(buf, "cdogs_icon.bmp");
GetDataFilePath(buf, "graphics/cdogs_icon.bmp");
g->icon = IMG_Load(buf);
AddSupportedGraphicsModes(g);
g->IsWindowInitialized = true;