debian/0000775000000000000000000000000012261263672007177 5ustar debian/source/0000775000000000000000000000000012245052365010474 5ustar debian/source/format0000664000000000000000000000001412245052365011702 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000001551212245052365011133 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Colobot Source: http://github.com/colobot/colobot Files: * Copyright: 2001-2008, Daniel ROUX & EPSITEC SA, http://www.epsitec.ch 2012-2013, Polish Portal of Colobot (PPC) 2006 Angelo "Encelo" Theodorou License: GPL-3+ Files: lib/clipboard/src/* Copyright: 2008, Freddie Witherden 2008-2009, Warzone Resurrection Project License: GPL-2+ Files: debian/* Copyright: Copyright 2013 Didier Raboud License: GPL-2+ Files: lib/clipboard/* Copyright: 1992-2007, Trolltech ASA 1999-2004, Eidos Interactive 2007, Giel van Schijndel 2007-2009, Warzone Resurrection Project 2008, Freddie Witherden License: GPL-2+ Files: lib/gtest/* lib/gmock/* Copyright: 2003-2009, Google Inc License: BSD-3-clause Files: lib/localename/* Copyright: 1995-2013, Free Software Foundation, Inc. License: LGPL-2.1+ Files: data/fonts/* Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. DejaVu changes are in public domain. License: Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: . The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. . The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". . This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. . The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. . THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. . Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. License: GPL-3+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . On Debian systems, the complete text of the GNU General Public License version 3 can be found in file "/usr/share/common-licenses/GPL-3". License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. License: BSD-3-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: LGPL-2.1+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'. debian/colobot.install0000664000000000000000000000057112245052365012230 0ustar usr/lib/colobot/libCBot.so usr/games/colobot usr/share/applications/colobot.desktop usr/share/icons/hicolor/scalable/apps/colobot.svg usr/share/icons/hicolor/48x48/apps/colobot.png usr/share/icons/hicolor/32x32/apps/colobot.png usr/share/icons/hicolor/16x16/apps/colobot.png usr/share/man/man6/colobot.6 usr/share/man/*/man6/colobot.6 usr/share/locale/*/LC_MESSAGES/colobot.mo debian/changelog0000664000000000000000000000415712261263672011060 0ustar colobot (0.1.2-3build1) trusty; urgency=medium * No change rebuild against glew 1.10. -- Dimitri John Ledkov Thu, 02 Jan 2014 13:20:58 +0000 colobot (0.1.2-3) unstable; urgency=low * Try another patch to consider non-Linux GNU variants -- Didier Raboud Fri, 29 Nov 2013 13:15:03 +0100 colobot (0.1.2-2) unstable; urgency=low * Add patch to let kFreeBSD and Hurd be considered Linuxes and therefore let the desktop files be installed -- Didier Raboud Tue, 26 Nov 2013 12:32:45 +0100 colobot (0.1.2-1) unstable; urgency=low * New 0.1.2 upstream release - Add Russian translation of interface and levels - Replace x86 assembler "int $3" code with assert(0) - New levels translation infrastructure in -data * Add patch to hide the black squares bug -- Didier Raboud Tue, 26 Nov 2013 09:25:48 +0100 colobot (0.1.1-2) unstable; urgency=low * debian/copyright fixes: - Add gnulib's localename copy copyright mention - Add gmock copyright reference - Add license statement for DejaVu fonts' copy (which is not used in the binary package) * Package re-organisation: - Move fonts links and translations back to colobot main package - Split colobot-common into -common, -sounds and -textures -- Didier Raboud Thu, 14 Nov 2013 13:41:55 +0100 colobot (0.1.1-1) unstable; urgency=low * New 0.1.1 upstream release - Fix non-freeness problems in data: - Replace CREATIVE-licensed thunder sound by a public-domain thunder sound - Drop useless license statement about the photograph of the NGC3606 nebula, which is in the public-domain * Drop noisy development-merging machinery in debian/rules * Add small gbp.conf * Bump Standards-Version to 3.9.5 without changes needed * Add Vcs-* fields to debian/control -- Didier Raboud Mon, 04 Nov 2013 09:47:45 +0100 colobot (0.1.0-1) unstable; urgency=low * Colobot Gold 0.1.0 alpha initial Debian release. (Closes: #695829) -- Didier Raboud Wed, 09 Oct 2013 22:14:50 +0200 debian/gbp.conf0000664000000000000000000000042212245052365010611 0ustar [DEFAULT] # the default branch for upstream sources: upstream-branch = master # the default branch for the debian patch: debian-branch = debian [git-dch] # don't include information from meta tags: meta = true # include the full commit message in the changelog: full = True debian/colobot-common-textures.install0000664000000000000000000000004112245052365015367 0ustar usr/share/games/colobot/textures debian/control0000664000000000000000000001131012261263672010576 0ustar Source: colobot Section: games Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Games Team Uploaders: Didier Raboud Build-Depends: debhelper (>= 9), cmake, libgl1-mesa-dev | libgl-dev, libglew-dev, libsdl1.2-dev (>= 1.2.10), libsdl-image1.2-dev, libsdl-ttf2.0-dev, libpng12-dev (>= 1.2), libboost-dev, libboost-system-dev, libboost-filesystem-dev, libboost-regex-dev, libopenal-dev, libsndfile-dev, librsvg2-bin, po4a, perl, google-mock, libgtest-dev Build-Depends-Indep: doxygen, graphviz Vcs-Git: git://anonscm.debian.org/collab-maint/colobot.git -b debian Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/colobot.git Standards-Version: 3.9.5 Homepage: http://colobot.info Package: colobot Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-dejavu-core, fonts-dejavu-extra, colobot-common (>= ${source:Version}), colobot-common-textures (>= ${source:Version}), colobot-common-sounds (>= ${source:Version}), Replaces: colobot-common (<< 0.1.1-2) Breaks: colobot-common (<< 0.1.1-2) Description: educational programming strategy game Colobot (Colonize with Bots) is an educational game aiming to teach programming through entertainment. You are playing as an astronaut on a journey with robot helpers to find a planet for colonization. It features 3D real-time graphics and a C++ and Java-like, object-oriented language, CBOT, which can be used to program the robots available in the game. Package: colobot-common Architecture: all Depends: ${misc:Depends}, Recommends: colobot (>= ${source:Version}) Description: educational programming strategy game - data Colobot (Colonize with Bots) is an educational game aiming to teach programming through entertainment. You are playing as an astronaut on a journey with robot helpers to find a planet for colonization. It features 3D real-time graphics and a C++ and Java-like, object-oriented language, CBOT, which can be used to program the robots available in the game. . This package contains the architecture-independent game data. Package: colobot-common-textures Architecture: all Depends: ${misc:Depends}, Recommends: colobot (>= ${source:Version}) Replaces: colobot-common (<< 0.1.1-2) Breaks: colobot-common (<< 0.1.1-2) Description: educational programming strategy game - textures Colobot (Colonize with Bots) is an educational game aiming to teach programming through entertainment. You are playing as an astronaut on a journey with robot helpers to find a planet for colonization. It features 3D real-time graphics and a C++ and Java-like, object-oriented language, CBOT, which can be used to program the robots available in the game. . This package contains the textures for the game. Package: colobot-common-sounds Architecture: all Depends: ${misc:Depends}, Recommends: colobot (>= ${source:Version}) Replaces: colobot-common (<< 0.1.1-2) Breaks: colobot-common (<< 0.1.1-2) Description: educational programming strategy game - sounds and music Colobot (Colonize with Bots) is an educational game aiming to teach programming through entertainment. You are playing as an astronaut on a journey with robot helpers to find a planet for colonization. It features 3D real-time graphics and a C++ and Java-like, object-oriented language, CBOT, which can be used to program the robots available in the game. . This package contains the sounds and music for the game. Package: colobot-dbg Architecture: any Section: debug Priority: extra Depends: ${misc:Depends}, ${shlibs:Depends}, colobot (= ${binary:Version}) Description: educational programming strategy game - debug symbols Colobot (Colonize with Bots) is an educational game aiming to teach programming through entertainment. You are playing as an astronaut on a journey with robot helpers to find a planet for colonization. It features 3D real-time graphics and a C++ and Java-like, object-oriented language, CBOT, which can be used to program the robots available in the game. . This package contains the debugging symbols. Package: colobot-dev-doc Architecture: all Section: doc Depends: ${misc:Depends}, libjs-jquery Recommends: colobot (>= ${source:Version}) Description: educational programming strategy game - source doc Colobot (Colonize with Bots) is an educational game aiming to teach programming through entertainment. You are playing as an astronaut on a journey with robot helpers to find a planet for colonization. It features 3D real-time graphics and a C++ and Java-like, object-oriented language, CBOT, which can be used to program the robots available in the game. . This package contains the doxygen documentation for the colobot source code. debian/colobot-common-sounds.install0000664000000000000000000000007512245052365015026 0ustar usr/share/games/colobot/music usr/share/games/colobot/sounds debian/colobot-dev-doc.links0000664000000000000000000000011312245052365013211 0ustar usr/share/javascript/jquery/jquery.js usr/share/doc/colobot/html/jquery.js debian/colobot-dev-doc.doc-base0000664000000000000000000000046512245052365013560 0ustar Document: colobot-source-doc Title: Colobot source code documentation Author: Polish Portal of Colobot Abstract: This is the Doxygen-generated documentation of the Colobot source code. Section: Programming Format: HTML Index: /usr/share/doc/colobot/html/index.html Files: /usr/share/doc/colobot/html/*.html debian/rules0000775000000000000000000000054712245052365010262 0ustar #!/usr/bin/make -f %: dh $@ \ --buildsystem=cmake \ --parallel \ --dbg-package=colobot-dbg override_dh_auto_configure: dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \ -DINSTALL_DOCS:BOOL=True \ -DOPENAL_SOUND:BOOL=True override_dh_auto_build: dh_auto_build -a dh_auto_build -i -- doc debian/colobot.links0000664000000000000000000000105312245052365011676 0ustar # From fonts-dejavu-core usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf usr/share/games/colobot/fonts/dvu_sans_bold.ttf usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf usr/share/games/colobot/fonts/dvu_sans_mono_bold.ttf usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf usr/share/games/colobot/fonts/dvu_sans_mono.ttf usr/share/fonts/truetype/dejavu/DejaVuSans.ttf usr/share/games/colobot/fonts/dvu_sans.ttf # From fonts-dejavu-extra usr/share/fonts/truetype/dejavu/DejaVuSans-Oblique.ttf usr/share/games/colobot/fonts/dvu_sans_italic.ttf debian/patches/0000775000000000000000000000000012246102642010616 5ustar debian/patches/i225-hide-black-squares-bug.patch0000664000000000000000000000201512245072427016541 0ustar Description: Hide upstream issue #225 "Black rectangles shows due to particle and fire effects" Author: Didier Raboud Origin: vendor Forwarded: https://github.com/colobot/colobot/issues/225 Last-Updated: 2013-11-26 --- a/src/graphics/engine/particle.cpp +++ b/src/graphics/engine/particle.cpp @@ -2875,6 +2875,12 @@ vertex[2] = Vertex(corner[3], n, Math::Point(m_particle[i].texSup.x, m_particle[i].texInf.y)); vertex[3] = Vertex(corner[2], n, Math::Point(m_particle[i].texInf.x, m_particle[i].texInf.y)); + // On first call, the coordinates are all 0, in that case, return as it's wrong. + if((m_particle[i].texSup.x-m_particle[i].texInf.x) == 0.0f || (m_particle[i].texSup.y - m_particle[i].texInf.y) == 0.0f ) { + // One particle texture dimension is zero, most probably wrong! + // Don't display it then. + return; + } m_device->DrawPrimitive(PRIMITIVE_TRIANGLE_STRIP, vertex, 4); m_engine->AddStatisticTriangle(2); } debian/patches/series0000664000000000000000000000006612246102642012035 0ustar i225-hide-black-squares-bug.patch fix-non-linux.patch debian/patches/fix-non-linux.patch0000664000000000000000000001331512246102642014355 0ustar commit 343fa8f0cbad19402a2533651acc53149be1fcf5 Author: Didier Raboud Date: Wed Nov 27 18:53:28 2013 +0100 Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's Linux, kFreeBSD and Hurd diff --git a/CMakeLists.txt b/CMakeLists.txt index ff30513..c4c3e39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ message(STATUS "Building Colobot \"${COLOBOT_VERSION_CODENAME}\" (${COLOBOT_VERS if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") message(STATUS "Build for Windows system") set(PLATFORM_WINDOWS 1) + set(PLATFORM_GNU 0) set(PLATFORM_LINUX 0) set(PLATFORM_MACOSX 0) set(PLATFORM_OTHER 0) @@ -52,15 +53,27 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") message(STATUS "Build for Linux system") set(PLATFORM_WINDOWS 0) set(PLATFORM_LINUX 1) + set(PLATFORM_GNU 1) set(PLATFORM_MACOSX 0) set(PLATFORM_OTHER 0) # Platform-dependent implementation of system.h set(SYSTEM_CPP_MODULE "system_linux.cpp") +elseif("${CMAKE_SYSTEM_NAME}" MATCHES "kFreeBSD" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "GNU") + message(STATUS "Build for kFreeBSD system") + set(PLATFORM_WINDOWS 0) + set(PLATFORM_LINUX 0) + set(PLATFORM_GNU 1) + set(PLATFORM_MACOSX 0) + set(PLATFORM_OTHER 0) + + # Platform-dependent implementation of system.h + set(SYSTEM_CPP_MODULE "system_other.cpp") elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") message(STATUS "Build for Mac OSX system") set(PLATFORM_WINDOWS 0) set(PLATFORM_LINUX 0) + set(PLATFORM_GNU 0) set(PLATFORM_MACOSX 1) set(PLATFORM_OTHER 0) @@ -72,6 +85,7 @@ else() message(STATUS "Build for other system") set(PLATFORM_WINDOWS 0) set(PLATFORM_LINUX 0) + set(PLATFORM_GNU 0) set(PLATFORM_MACOSX 0) set(PLATFORM_OTHER 1) @@ -226,7 +240,7 @@ include("${colobot_SOURCE_DIR}/cmake/msys.cmake") ## # Clipboard support needs X11 libraries ## -if(PLATFORM_LINUX OR PLATFORM_MACOSX) +if(PLATFORM_GNU OR PLATFORM_MACOSX) find_package(X11 REQUIRED) if(PLATFORM_MACOSX) # Add the includes for X11 diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index 9fa0c5e..87c8a4b 100644 --- a/desktop/CMakeLists.txt +++ b/desktop/CMakeLists.txt @@ -4,7 +4,7 @@ set(COLOBOT_ICON_FILE colobot.svg) # Render SVG icon in various sizes find_program(RSVG_CONVERT rsvg-convert) -if(RSVG_CONVERT AND (PLATFORM_LINUX OR PLATFORM_MACOSX)) +if(RSVG_CONVERT AND (PLATFORM_GNU OR PLATFORM_MACOSX)) add_custom_target(png-icons ALL) foreach(PNGSIZE 512 256 128 48 32 16) add_custom_command( @@ -15,7 +15,7 @@ if(RSVG_CONVERT AND (PLATFORM_LINUX OR PLATFORM_MACOSX)) add_custom_target(png-icon-${PNGSIZE} ALL DEPENDS ${PNGSIZE}/colobot.png) add_dependencies(png-icons png-icon-${PNGSIZE}) - if(PLATFORM_LINUX) + if(PLATFORM_GNU) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGSIZE}/colobot.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${PNGSIZE}x${PNGSIZE}/apps/ @@ -37,7 +37,7 @@ if(RSVG_CONVERT AND (PLATFORM_LINUX OR PLATFORM_MACOSX)) endif() -if(PLATFORM_LINUX) +if(PLATFORM_GNU) # Install Desktop Entry file set(COLOBOT_DESKTOP_FILE colobot.desktop) add_custom_command( @@ -112,7 +112,7 @@ if(PLATFORM_LINUX) endforeach() endif() endif() -endif(PLATFORM_LINUX) +endif(PLATFORM_GNU) if(PLATFORM_MACOSX) configure_file(Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/Info.plist) diff --git a/lib/clipboard/CMakeLists.txt b/lib/clipboard/CMakeLists.txt index a189ec4..7999cc1 100644 --- a/lib/clipboard/CMakeLists.txt +++ b/lib/clipboard/CMakeLists.txt @@ -7,8 +7,6 @@ add_definitions(-DLIB_COMPILE=1) if(PLATFORM_WINDOWS) set(CLIPBOARD_SRC src/clipboardWin32.c) -elseif(PLATFORM_LINUX) - set(CLIPBOARD_SRC src/clipboardX11.c) else() set(CLIPBOARD_SRC src/clipboardX11.c) endif() 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@ diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 38bffda..278519f 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -6,6 +6,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/test/unit/ui/CMakeLists.txt b/test/unit/ui/CMakeLists.txt index 8086967..503f84b 100644 --- a/test/unit/ui/CMakeLists.txt +++ b/test/unit/ui/CMakeLists.txt @@ -10,8 +10,6 @@ ${CLIPBOARD_INCLUDE_DIR} # Platform-dependent implementation of CSystemUtils if(PLATFORM_WINDOWS) -elseif(PLATFORM_LINUX) - set(ADDITIONAL_LIB "-lX11") elseif(PLATFORM_MACOSX) set(ADDITIONAL_LIB "${X11_X11_LIB}") else() debian/colobot-common.install0000664000000000000000000000022412245052365013511 0ustar usr/share/games/colobot/ai usr/share/games/colobot/help usr/share/games/colobot/icons usr/share/games/colobot/levels usr/share/games/colobot/models debian/compat0000664000000000000000000000000212245052365010372 0ustar 9 debian/colobot-dev-doc.install0000664000000000000000000000003312245052365013540 0ustar usr/share/doc/colobot/html