marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,906 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

234 Commits (016f626cbe5e10e0291f28d6b16b4057ba6c9975)

Author SHA1 Message Date
Peter Wortmann d5c075ade8 Yet another variant on how to find data files 
This time, the relocation code checks for a "System.c4g" in either
the executable path or a "data" folder directly below. CMake makes
sure that this points somewhere sensible for normal builds.

TODO:
* Check whether this actually works under Unixes. Can "ln -sf"
  delete important stuff? Is there a safe alternative?
* Further unify with the Mac Os solution. Other platforms might
  auto-pack for release builds too, for example - and it might
  be a good idea to have a proper data subdirectory in Mac bundles
  as well.
 2011-11-09 00:45:07 +00:00
Günther Brammer cd93daf8b9 cmake: Replace redundant custom targets with a DEPENDS on the groups target 
For some reason, add_dependencies didn't work for making the groups target
depend on the custom_commands, but specifying them via DEPENDS works.
 2011-11-05 23:07:11 +01:00
Günther Brammer d709de7e73 cmake: Always pack groups during build 
This fixes make install, which previously tried to install nonexistant
packed groups from the source directory. Make it use the ones from
the build directory and build them during make all.
 2011-11-02 01:43:36 +01:00
Günther Brammer ccbf4d1d45 Consolidate duplicated simple Log functions 
The various small utilities do not use the engine Log implementation but
one that simply prints to stdout. Instead of duplicating that one, link a
common one into the utilities.
 2011-11-02 21:36:39 +01:00
Günther Brammer b911630578 Replace OpenSSL SHA1 implementation with one copied from boost/uuid 
Although the code already uses boost, boost/uuid hides the sha1
implementation in a deeply nested namespace, which is just too bizarre to
use. Also the name of that namespace suggests that it is just an
implementation detail that could go away without notice.
 2011-01-10 21:30:40 +01:00
Günther Brammer 3c41310fa3 Remove C4ConfigShareware to reduce OpenSSL dependency 2011-11-02 00:07:29 +01:00
Nicolas Hake f9f01bef9a cmake: Search for FMOD headers and add to include path 2011-10-28 23:49:11 +02:00
Nicolas Hake d5669964b8 tests: Fix on linux-gcc 2011-10-16 14:17:43 +02:00
Günther Brammer 7b325561f0 CMake: Remove now redundant code to pack c4groups during installation 2011-10-12 20:59:28 +02:00
Günther Brammer f1cedd5420 Look in the planet folder for game data, too 
This replaces the BUILD_TO_PLANET option and makes in-tree Makefile builds
run without further work. Out-of-tree builds need a symlink to planet from
the build directory.
 2011-10-11 15:15:41 +02:00
Julius Michaelis b7d67bd143 make install a predefined set of c4groups instead of everything in the planet directory 2011-10-11 18:59:58 +02:00
Peter Wortmann ad79ece074 Mac: Put game data into bundle 
This makes it possible to ship the bundle stand-alone. Also
note that CMake will automatically pack the game data for
release builds, but sym-link the game data for debug builds.

Note this means you will only see the parts of planet/ that
are mentioned in OC_C4GROUPS in CMakeList.txt! This is equivalent
to the behaviour of the shipped build, so I don't see this as
a problem.
 2011-10-09 17:09:48 +01:00
Günther Brammer 1cafba4be8 Rename files implementing C4AbstractApp and C4Window 2011-10-03 17:19:24 +02:00
Günther Brammer 55f6bc8d0f Replace CSurface and C4Surface with just C4Surface 
The methods that previously were on C4Surface still are in a separate
file.
 2011-10-03 16:06:41 +02:00
Günther Brammer efed250aa7 Rename CMarkup to C4Markup 2011-08-27 21:13:15 +02:00
Günther Brammer 6700bff4de Replace CFacet with C4Facet 
The latter is almost a superset of the former.
 2011-08-27 17:47:49 +02:00
Günther Brammer 19ce704ae5 CMake: Change project name to openclonk to avoid conflict with the binary 
Apparently, Eclipse has problems with projects created by CMake that
have a binary with the name of the project.
 2011-08-27 22:04:33 +02:00
Günther Brammer 562816cfe5 Clean up some unused variables and obsolete FIXMEs 2011-09-28 01:09:56 +02:00
Nicolas Hake 8073e1cb47 win32: Remove DirectX config option 2011-10-03 13:12:55 +02:00
Nicolas Hake cc672bbd00 win32: Automatically check for DbgHelp availability 2011-10-03 13:09:51 +02:00
Nicolas Hake 14f81d7eef Move cmake modules to separate directory 2011-10-03 13:03:22 +02:00
Tobias Zwick 461a8594c8 removed Tests.ocf from "setup" build configuration 2011-09-29 22:22:42 +02:00
Günther Brammer bfee2c5b81 Version 5.1.91 (5.2 Beta) 2011-09-27 01:15:00 +02:00
Günther Brammer 26ff41185e win32: Uninstaller correctly removes the user settings 2011-09-22 22:26:06 +02:00
Günther Brammer 1cea606c41 win32: Installer creation works with MSVC 
CMake even reads the makensis path from the registry.
 2011-09-21 22:25:33 +02:00
Günther Brammer 89e15ec212 win32: Installer gets the product name from the Version.txt 2011-09-22 22:37:18 +02:00
Günther Brammer c02354f56c win32: Add build rules for the installer to CMakeLists.txt and Makefile.am 2011-09-20 19:43:22 +02:00
Günther Brammer c46c2cfa5e cmake: Make switching to GTK3 after first run of cmake work 
For some reason, the result of a pkg-config run is cached indefinitely,
even if the arguments change.
 2011-08-31 19:40:22 +02:00
Nicolas Hake fe747db554 Clean up copyright notices 
Use real names for copyright attribution wherever they are known,
drop duplicates
 2011-09-01 12:47:54 +02:00
Nicolas Hake 021f464365 Add copyright header to CMakeLists.txt 2011-08-31 23:20:17 +02:00
Nicolas Hake fc194d62e1 msvc: Don't link release CRT in debug builds 
This will prevent the linker from automatically linking to the release CRT
even if some library import libs suggest it.
 2011-08-19 15:50:40 +02:00
Armin Burgmeier 771163be4b Correctly reload mesh materials on definition reload 
This does not fix #76 yet, but it's a first step.
 2011-08-17 23:50:33 +02:00
Günther Brammer 46ed387fef CMake: Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_CACHEFILE_DIR 
For some reason, the latter is empty on the first CMake run.
 2011-08-04 19:24:39 +02:00
Nicolas Hake 351896c921 Drop netpuncher from the default build, add script shell 2011-06-03 21:47:12 +02:00
Nicolas Hake b7244f8ca3 #589: Make c4script target compile on MSVC 2011-06-02 22:10:52 +02:00
Peter Wortmann bfb0849fe5 Fixed Mac build 2011-05-21 16:38:54 +01:00
Peter Wortmann a02ccafc4d Shader landscape rendering, first simple version (scaler, shading) 2011-05-24 00:12:19 +01:00
Nicolas Hake 97f699a005 Search for GTest and add a unit testing project if available 
Currently this only tests correct UTF-8 handling.
 2011-05-17 18:33:28 +02:00
Günther Brammer 273acfff80 win32: Make vfw32 optional 
The features it was used for are very seldomly used, and some build
environments don't have the import library.
 2011-05-12 17:13:38 +02:00
Nicolas Hake 25f41d6e9f Remove StdConfig.cpp from CMake c4group project 2011-04-05 18:03:03 +02:00
Günther Brammer 6e30f2b7e8 win32: Remove unused StdConfig class and associated Registry APIs 
It has long since been replaced by the StdCompilerConfig* classes. A few
of the Registry functions are still used in other code, and a few are now
implementation details.
 2011-04-02 17:49:55 +02:00
Günther Brammer bd051a972d win32: Remove duplicate file type association code from the engine 
The installer already does this, and on newer windows versions the engine
isn't able to do this anyway.
 2011-04-02 17:31:01 +02:00
Günther Brammer 0f44b39ab9 Split CStdApp out of StdWindow.h into StdApp.h 2011-03-19 22:09:10 +01:00
Günther Brammer cacceef1c6 linux: use eventfd for CStdNotifyProc 2011-03-17 02:26:37 +01:00
Günther Brammer 8036211c30 linux: Use timerfd instead of poll timeouts 2011-03-15 17:27:10 +01:00
Martin Plicht 2eb7a7c3e2 mac: Remove old c4 icons and replace by low-res oc icons, adjust file types understood by app 2011-03-14 21:54:56 +01:00
Julius Michaelis 11575222f0 gcc&cmake: precompiled header support 2011-03-12 22:01:23 +01:00
Günther Brammer 6c2a89eaf8 Replace timeGetTime with a platformneutral GetTime wrapper 2011-03-13 17:25:35 +01:00
Armin Burgmeier 884809e8f2 Merge filename extension changes 2011-03-13 17:15:40 +01:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
Armin Burgmeier eaf62f71f9 Change .c4f extension to .ocf 2011-03-13 16:38:33 +01:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00
Armin Burgmeier e282bf9a9c Change .c4s extension to .ocs 2011-03-13 16:11:55 +01:00
Günther Brammer c49f8b32d5 win32: wrap all windows.h-includes to always undef troubling macros 2011-03-13 15:48:45 +01:00
Armin Burgmeier 089f07e40a Set correct dependency for resource files compiled with MinGW 2011-03-12 13:47:46 +01:00
Nicolas Hake a98f2b928b CMakeLists: Delay STATIC_ASSERT compile test until CXXFLAGS are determined 2011-03-10 22:49:33 +01:00
Nicolas Hake 62f840412e Check for static_assert support 2010-05-29 14:44:16 +02:00
Julius Michaelis 98757cb488 Added c4script standalone to CMakeLists 2011-03-07 20:53:13 +01:00
Günther Brammer 111df0392c Split C4Script.cpp into game functions and C4Script support functions 2011-03-04 13:49:41 +01:00
Günther Brammer e250312c26 Move C4DefList class into from C4Def.cpp/h to new C4DefList.cpp/h 2011-03-03 17:10:22 +01:00
Julius Michaelis 530a70f43c Create a log file for each instance of clonk on UNIXes (cmake only) 2011-03-02 18:54:28 +01:00
Nicolas Hake ff2ac49368 win32: Log human-readable crash info while writing minidump 
The information that will be written to the logfile is the exception data,
processor control and GP registers (x86/x64), up to 512 bytes around the stack
pointer, a stack trace, and the list of loaded modules.
 2011-03-01 13:28:13 +01:00
Günther Brammer 7ce65373a3 Replace C4AList with some std::lists 2011-02-26 00:48:19 +01:00
Julius Michaelis 922691bafb netpuncher/cmake: Fix MSVC build 2011-02-12 15:27:07 +01:00
Armin Burgmeier 1d5dd911ad Fix linux build 2011-02-06 00:23:55 +01:00
Günther Brammer c74e43b61f Add C4ObjectScript.cpp 2011-01-20 01:56:01 +01:00
Günther Brammer dfa1ad948b Move C4AulDefFunc* templates to a header 2011-01-20 00:19:19 +01:00
Julius Michaelis 8cbfa00a4e dedicated: fix CMake and object loading (thanks ck and Guenther) 2011-01-30 21:44:54 +01:00
Nicolas Hake b8d3b00d90 Move TinyXML into thirdparty/ 2011-01-25 21:28:44 +01:00
Armin Burgmeier 34e6e45864 Fix the netpuncher build on Windows 
Making the nightly builds work again
 2011-01-27 01:15:48 +01:00
Julius Michaelis a7684cb196 netpuncher: make it compile again with CMake 
cmake: CMake 2.6 compatibility
 2011-01-25 18:56:40 +01:00
Nicolas Hake ad86a5358e cmake: Install only c4d/c4f/c4g/c4s 2011-01-20 15:38:04 +01:00
Günther Brammer 5151177d44 Move some BMP-loading helpers to C4Landscape.cpp 2011-01-19 23:52:46 +01:00
Günther Brammer 83322f596a Move Mesh loaders from src/platform to src/lib 
They are entirely platform-independent.
 2011-01-19 22:55:18 +01:00
Günther Brammer 4e01716f28 editor: Automatically open landscape tools dialog 
The landscape tools is mostly useless without the dialog, whereas the other
modes are useful without the dialog.

But mostly this is a side effect of removing PropertyDlg.Active along with
the C4PropertyDlg class.
 2011-01-13 18:21:59 +01:00
Armin Burgmeier 9f74506e9b Support loading game data from system path 2011-01-06 21:18:13 +01:00
Armin Burgmeier bcf61516b5 Polish 'make install' support a bit 
In particular:
  * Instead of replicating icons in the repository, install from src/res/oc.ico
  * Pack the game data
  * Remove runclonk script, install clonk binary only into bin/
    (this will make Clonk not run for the moment because it does not find
    its game data, but I intend to change that with a followup patch soon).
 2010-12-30 01:21:07 +01:00
Spell 1121db7164 Installation Support V2 (Including CPack Support) 2010-08-03 17:59:36 +02:00
Armin Burgmeier ffe24d471a Add a CMake option for generating mini dumps 2011-01-02 01:20:52 +01:00
Martin Plicht a22d5ee35c Mac: Add Cocoa port 2010-12-27 04:49:02 +01:00
Martin Plicht cc95f8231f Add IsGermanSystem as forward declaration to PlatformAbstraction.h and implement IsGermanSystem, OpenURL and EraseItemSafe in platform-specific files (StdWindow.cpp/StdGtkWindow.cpp etc) 2010-12-27 03:19:19 +01:00
Günther Brammer a89667f3d7 Merge C4ValueList and C4ValueArray into one class 
Now that the last usage of numbered variables in effects is gone,
C4ValueList wasn't used except as a base class. If the array and
refcounting aspect should be separated at all, the reference count
should be in the base class.
 2010-12-27 17:05:35 +01:00
Armin Burgmeier 1967d914c2 Add a compile-time option to disable automatic update 2010-12-26 21:39:52 +01:00
Günther Brammer 0b746f756a Autotools: Add new editor files and rename a new header to .h 
If it's #included, it's a header, even if it looks like a normal
compilation unit.
 2010-12-13 03:11:06 +01:00
Martin Plicht 44928f1a8d Platform-specific code in C4Console.cpp gets factored out into C4Console(Win32/GTK).cpp 2010-12-11 19:50:38 +01:00
Nicolas Hake 60a025a4cc Fix incorrect handling of debug build compiler flags 2010-10-22 21:19:49 +02:00
Armin Burgmeier efee21b371 Fix MinGW build once again 2010-10-06 22:21:09 +02:00
Nicolas Hake a0130e0389 Add getopt third party library 
Some build systems, particularly MSVC, don't ship with an implementation
of getopt or getopt_long in their standard library. This patch adds a BSD
licensed implementation, to be used in case there is no system provided
one.
 2010-10-05 00:14:07 +02:00
Günther Brammer a329ff9b51 Merge. 2010-10-01 17:56:41 +02:00
Nicolas Hake b29ab382ee cmake/mac: Fix path to C4FileMonitorMac.mm 2010-09-30 07:20:03 +02:00
Nicolas Hake bfd803bd54 cmake: Remove useless NULL_IS_NULLPTR_T check 2010-09-29 23:14:08 +02:00
Nicolas Hake 8b1838b3e7 win32/msvc: disable 64 bit truncation warnings 2010-09-29 23:11:12 +02:00
Nicolas Hake c76e339ef6 cmake: Fix MSVC multicore/minimal build toggle 2010-09-29 23:08:08 +02:00
Martin Plicht 37703d7ae6 Mac: Add FSEvents implementation of C4FileMonitor 2010-09-29 00:17:56 +02:00
Günther Brammer 9f0ba09c04 Split C4Viewportwindow out of C4Viewport.h/cpp 2010-09-28 21:29:00 +02:00
Martin Plicht 243e20bdf6 Add OpenAL implementation of C4SoundSystem 
With an Ogg Vorbis loader using libvorbis and a .wav loader using a macosx
API.

Günther: Add autotools support
 2010-09-26 02:36:35 +02:00
Armin Burgmeier bd2f63bf1d Add an option to build against GTK+ 3 2010-09-22 17:11:19 +02:00
Armin Burgmeier 9f5038be27 Revert 924f8fc47d35 (gnu++0x -> c++0x) 
This breaks the mingw build otherwise.
 2010-09-04 20:01:43 +02:00
Armin Burgmeier 0190e7c4c7 When using g++ then use C++0x mode, not C++0x with GNU extensions 2010-09-04 13:05:22 +02:00
Armin Burgmeier 2547d44baf Linux: Fix detection of C library functions by CMake 2010-09-04 12:48:17 +02:00