diff options
| author | Piotr Dziwiński <piotrdz@gmail.com> | 2013-12-03 11:50:27 -0800 |
|---|---|---|
| committer | Piotr Dziwiński <piotrdz@gmail.com> | 2013-12-03 11:50:27 -0800 |
| commit | dae8d8738908a65a4ee4ef14d88681e196825126 (patch) | |
| tree | aba4e06c6604d08415fc824dd668b897580af441 /src | |
| parent | 047db22d4a34db3fa3e41f41ccdab6f02174b78f (diff) | |
| parent | 343fa8f0cbad19402a2533651acc53149be1fcf5 (diff) | |
| download | colobot-dae8d8738908a65a4ee4ef14d88681e196825126.tar.gz colobot-dae8d8738908a65a4ee4ef14d88681e196825126.tar.bz2 colobot-dae8d8738908a65a4ee4ef14d88681e196825126.zip | |
Merge pull request #259 from OdyX/dev-fix-non-linux
Fix GNU non-Linux platforms
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/config.h.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef59973..c32f054 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,6 +28,8 @@ if(MXE) # MXE requires special treatment elseif(PLATFORM_WINDOWS) # because it isn't included in standard linking libraries set(PLATFORM_LIBS "-lintl") +elseif(PLATFORM_GNU) + set(PLATFORM_LIBS "-lX11") elseif(PLATFORM_LINUX) # for clock_gettime set(PLATFORM_LIBS "-lrt -lX11") diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index 63cd93b..6408b6e 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -3,6 +3,7 @@ // Macros set by CMake #cmakedefine PLATFORM_WINDOWS @PLATFORM_WINDOWS@ #cmakedefine PLATFORM_LINUX @PLATFORM_LINUX@ +#cmakedefine PLATFORM_GNU @PLATFORM_GNU@ #cmakedefine PLATFORM_MACOSX @PLATFORM_MACOSX@ #cmakedefine PLATFORM_OTHER @PLATFORM_OTHER@ |