bea84f0af4
Don't set rpath if libCBot is compiled statically
2013-11-13 09:35:32 +01:00
ffdba25411
Add MacOSX bundle-specific installation paths
2013-11-13 09:35:32 +01:00
aeefdbd1be
On MacOSX, define the LangPath as being i18n in the Resources path of the bundle
2013-11-13 09:35:32 +01:00
b32f87bac7
Abstract the definition of LangPath to CSystemUtils
2013-11-13 09:35:32 +01:00
93727a3fdf
On MacOSX, don't cache the Data, Sound and Music paths
...
As users can potentially move the bundle around, it doesn't make sense to cache these
(It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most)
2013-11-13 09:35:32 +01:00
e78d2cce18
On MacOSX, define the DataPath as being the Resources path in the bundle
2013-11-13 09:35:32 +01:00
17ad3e5a90
Abstract the definition of DataPath to CSystemUtils
2013-11-13 09:35:31 +01:00
8f7f56f1ea
On Mac OS X, write colobot.ini and savegames to Application Support directories
2013-11-13 09:35:31 +01:00
68d9a72357
Generate an icns icon on Mac OSX
2013-11-13 09:35:19 +01:00
11dd911faf
Under MacOSX, generate an Info.plist
2013-11-13 09:34:24 +01:00
9638327932
Drop redundant custom_target for po4a
2013-11-08 10:01:24 +01:00
d8762fdd8d
Reorder desktop/CMakeLists.txt for more platform-specific clarity
2013-11-08 10:01:24 +01:00
bf0c0227ec
Fix tab-vs-space in CMake configuration file
2013-11-08 10:01:24 +01:00
103044649f
Merge pull request #248 from OdyX/dev-add-russian
...
Add russian basic support
2013-11-07 06:45:03 -08:00
8b65e9b56f
Add russian language support
2013-11-07 14:44:12 +01:00
47bc95a47c
Merge pull request #246 from OdyX/dev-fix-mxe-build
...
Only use PO4A on desktop file and manpages on non-Windows builds
2013-11-05 07:23:22 -08:00
116d72a4b7
Only use PO4A on desktop file and manpages on non-Windows builds
...
Fixes the MXE-with-PO4A build
2013-11-05 15:00:02 +01:00
d8e50e4eeb
Version bump (0.1.1)
2013-11-03 13:02:25 +01:00
74b99781e8
Updated data submodule
2013-11-03 12:54:41 +01:00
f0ee721bec
Merge pull request #241 from OdyX/dev-fix-licensing-problems
...
colobot-data: Files under unclear license
2013-11-03 02:34:50 -08:00
2acc338c3a
Drop now-useless display of licenses.txt in PHASE_GENERIC
...
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01:00
816f4e91b9
Merge pull request #245 from OdyX/dev-platform-fixes
...
Platform fixes (Windows Icon and Mac OSX SDL_Main fix)
2013-10-29 14:12:07 -07:00
cd97feabb0
Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
False alarm, was caused probably by faulty build bot.
This definately should work on all platforms.
2013-10-29 22:04:12 +01:00
4680137ca4
On MacOSX, use SDL_Main
2013-10-29 14:54:11 +01:00
9e9a9937ba
Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop"
...
This was the wrong fix for the problem.
This reverts commit f31a570d96
2013-10-29 14:43:29 +01:00
ee90f02bc4
Add an icon and executable information to the colobot.exe when build in MXE
2013-10-29 14:40:58 +01:00
70af33e45d
Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
Looks like it doesn't work on all platforms
2013-10-28 19:36:43 +01:00
75871cc9ca
Merge pull request #243 from OdyX/dev-fix-textures-loading
...
Fix the detection of alpha-channel in textures as created by IMG_Load
2013-10-28 10:11:54 -07:00
c2a717d5c9
Let mouse.png's format be detected
...
Fixes the mouse cursor on Mac OS X
2013-10-28 15:25:14 +01:00
9e439d88bf
Fix the detection of alpha-channel in textures as created by IMG_Load
...
This fixes the textures loading under Mac OS X
2013-10-28 15:23:56 +01:00
19a7196b61
Merge pull request #242 from OdyX/dev-macosx
...
Mac OSX (Darwin) build support
2013-10-26 09:21:03 -07:00
9ddb034bfa
Add libintl library to the unit tests on Mac OSX
2013-10-26 13:19:23 +02:00
f31a570d96
Include SDL.h in main.cpp to make sure the main loop is SDL's main loop
...
This allows the MacOSX program to start.
2013-10-26 13:19:13 +02:00
7fb83068ed
Fix for CMakeLists error
2013-10-24 21:48:14 +02:00
8d62da0c99
Added option to force to use bundled gmock/gtest
...
* resolves problem when version of gmock/gtest found installed in system
disagrees with the bundled one
* removed -DGTEST_HAVE_PTHREAD=0, seems that pthread is needed after all
2013-10-24 21:37:07 +02:00
97baf7242e
Fix system_other implementation by adding an Init() and fixing the wrong const
2013-10-24 21:12:52 +02:00
591ba30a00
Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script
2013-10-24 21:12:52 +02:00
b3b6a40d9e
MacOSX: Add initial support in CMake build infra
2013-10-24 21:12:52 +02:00
485d0baf67
Updated data submodule
2013-10-24 18:37:24 +02:00
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
ccb63bd29e
Fixed memory leaks in CText
2013-10-12 21:14:33 +02:00
5d0d9b5aa5
Fixed some CBot-related memory leaks
...
* fixed leaks in CScript::CheckToken()
* fixed leaks in CInterface
* commented out unused function in robotmain.cpp
2013-10-12 18:50:30 +02:00
141f73866e
Updated data submodule
2013-10-12 13:50:34 +02:00
d70d31acc1
Fix for #232 - Images in SatCom
...
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
39866db502
Fixed @Emxx52 's fail :P
...
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
2013-09-08 17:55:48 +02:00
2891c2ea4c
Added '-game' launch option
2013-09-08 17:05:11 +02:00
b5e87aa91f
Datadir in command line didn't work with config.
...
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
3e8568bda4
Fixed test binaries location
2013-06-29 00:31:30 +02:00
a4b3b7d0af
Typo fix
2013-06-27 19:43:06 +02:00
f8a6c6750a
Fix for #228
...
* "empty" objects were wrongly handled in CPyro
2013-06-26 20:44:17 +02:00
Didier 'OdyX' Raboud