diff options
| author | Bernd Wachter <bwachter-tmw@lart.info> | 2010-01-23 21:56:45 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-31 17:45:38 +0100 |
| commit | cf85e1fc67900ac79ac18413a19878ae5e608b4d (patch) | |
| tree | 44a2f8be20076d52dab9e6554889e84d5ca3c3fe | |
| parent | a39e10b8323d3f26e3eaddb83568f1854170210d (diff) | |
| download | mana-client-cf85e1fc67900ac79ac18413a19878ae5e608b4d.tar.gz mana-client-cf85e1fc67900ac79ac18413a19878ae5e608b4d.tar.bz2 mana-client-cf85e1fc67900ac79ac18413a19878ae5e608b4d.tar.xz mana-client-cf85e1fc67900ac79ac18413a19878ae5e608b4d.zip | |
Add win32 rc handling to cmake; fix icon path
| -rw-r--r-- | src/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/mana-ea.rc | 23 | ||||
| -rw-r--r-- | src/mana.rc | 8 |
3 files changed, 47 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc0a0c3b..6b401967 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,6 +69,22 @@ INCLUDE_DIRECTORIES( ${GUICHAN_INCLUDE_DIR} ) +# enable rc-handling with mingw +# most likely this part can be kicked out with some later cmake version +IF (MINGW) + FIND_PATH(MINGW_INCLUDE_DIR windows.h $ENV{INCLUDE}) + IF (MINGW_INCLUDE_DIR) + MESSAGE(STATUS "Found mingw headers: ${MINGW_INCLUDE_DIR}") + INCLUDE_DIRECTORIES(${MINGW_INCLUDE_DIR}) + ELSE() + MESSAGE(FATAL_ERROR "Unable to find mingw headers. Required for windres") + ENDIF() + SET(CMAKE_RC_COMPILER_INIT windres) + ENABLE_LANGUAGE(RC) + SET(CMAKE_RC_COMPILE_OBJECT + "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>") +ENDIF() + # Fix some stuff that gets not hidden by mainline modules MARK_AS_ADVANCED(PHYSFS_INCLUDE_DIR) MARK_AS_ADVANCED(PHYSFS_LIBRARY) @@ -568,6 +584,10 @@ SET(SRCS_MANA net/manaserv/tradehandler.h ) +IF (WIN32) + SET(SRCS_MANA ${SRCS_MANA} mana.rc) + SET(SRCS_EA ${SRCS_EA} mana-ea.rc) +ENDIF () SET (PROGRAMS mana mana-ea) diff --git a/src/mana-ea.rc b/src/mana-ea.rc new file mode 100644 index 00000000..12068ea2 --- /dev/null +++ b/src/mana-ea.rc @@ -0,0 +1,23 @@ +#include <windows.h> // include for version info constants + +#include "winver.h" + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/mana.ico" + +1 VERSIONINFO +FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +//FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" { + BLOCK "040904E4" { + VALUE "CompanyName", "The Mana Development Team" + VALUE "FileVersion", PACKAGE_VERSION + VALUE "FileDescription", "Mana (Eathena)" + VALUE "LegalCopyright", "2004-2010 (C)" + VALUE "OriginalFilename", "mana-ea.exe" + VALUE "ProductName", "Mana MMORPG Client" + VALUE "ProductVersion", PACKAGE_VERSION + } + } +} diff --git a/src/mana.rc b/src/mana.rc index 62dd9ec3..1da5f41d 100644 --- a/src/mana.rc +++ b/src/mana.rc @@ -2,22 +2,22 @@ #include "winver.h" -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/mana.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/mana.ico" 1 VERSIONINFO FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD -FILETYPE VFT_APP { +//FILETYPE VFT_APP +{ BLOCK "StringFileInfo" { BLOCK "040904E4" { VALUE "CompanyName", "The Mana Development Team" VALUE "FileVersion", PACKAGE_VERSION VALUE "FileDescription", "Mana" - VALUE "LegalCopyright", "2004-2009 (C)" + VALUE "LegalCopyright", "2004-2010 (C)" VALUE "OriginalFilename", "mana.exe" VALUE "ProductName", "Mana MMORPG Client" VALUE "ProductVersion", PACKAGE_VERSION } } } - |