diff options
| author | Piotr Dziwiński <piotrdz@gmail.com> | 2013-10-29 14:12:07 -0700 |
|---|---|---|
| committer | Piotr Dziwiński <piotrdz@gmail.com> | 2013-10-29 14:12:07 -0700 |
| commit | 816f4e91b909a47f348cb590d72368e4aa4d22e2 (patch) | |
| tree | ee9b0effd6545ddcc354657487f38537179ab9cc /src | |
| parent | cd97feabb0d3cf808f0332f8d9467f198e8d5d29 (diff) | |
| parent | 4680137ca4c4941947e53def97a0f5eadbbe9f2e (diff) | |
| download | colobot-816f4e91b909a47f348cb590d72368e4aa4d22e2.tar.gz colobot-816f4e91b909a47f348cb590d72368e4aa4d22e2.tar.bz2 colobot-816f4e91b909a47f348cb590d72368e4aa4d22e2.zip | |
Merge pull request #245 from OdyX/dev-platform-fixes
Platform fixes (Windows Icon and Mac OSX SDL_Main fix)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/app/main.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c01fe0f..2fab853 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,6 +50,12 @@ if(OPENAL_SOUND) ) endif() +set(RES_FILES "") + +if(PLATFORM_WINDOWS) + set(RES_FILES "../desktop/colobot.rc") +endif() + # Platform-dependent implementation of system.h if(PLATFORM_WINDOWS) set(SYSTEM_CPP_MODULE "system_windows.cpp") @@ -182,6 +188,7 @@ ui/studio.cpp ui/target.cpp ui/window.cpp ${OPENAL_SRC} +${RES_FILES} ) diff --git a/src/app/main.cpp b/src/app/main.cpp index 1e70beb..5c0afd3 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -28,7 +28,6 @@ #include "common/misc.h" #include "common/restext.h" -#include <SDL.h> /* Doxygen main page */ |