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

62 Commits (c01422d3ceef879714d49f65cec87253c8ac3099)

Author SHA1 Message Date
Armin Burgmeier 99eced551c Add boost headers to include path 2010-03-02 18:56:10 +01:00
Nicolas Hake 11e9f3235b Prefer loading meshes from binary format 
This implements a loader for Ogre's binary mesh format. Loading times
are vastly superior to the TinyXML parser. If no binary mesh exists,
the loader will fall back to parsing XML.

This changeset introduces a dependency on the Boost libraries.
 2010-03-02 17:12:28 +01:00
Nicolas Hake 766abfd190 msvc: Working build on x64 
Win64 is a LLP64 architecture, so please don't use a long for storing
pointers. Use intptr_t instead.
 2010-02-28 01:42:57 +01:00
Martin Plicht 494b13094e Add files from debug branch to CMakeLists.txt 2010-02-24 17:40:18 +01:00
Armin Burgmeier d79394d91f Compile resource file with MinGW 2010-02-20 22:25:57 +01:00
Günther Brammer ff8d950e85 Remove C4ENGINE define 
Most files using it weren't used by c4group-the-application anymore, and
the remaining stuff can be dealt with by using stubs or the same code in
both cases.
 2010-02-17 22:59:46 +01:00
Günther Brammer c20beac186 CMake: win32 with mingw fixes 
- Only use the platform sdk with MSVC
- workaround cmake being unable to find standard windows libraries
 2010-01-07 14:30:45 +01:00
Peter Wortmann 2f2065f456 Add missing file for Mac OS X build instead of defining stubs [Günther] 2010-02-11 14:19:13 +01:00
Peter Wortmann d196565fea Only search for iconv library if iconv.h was found 2010-02-09 19:21:00 +01:00
Peter Wortmann 41cecc17fc Fixed X-Code compilation 2010-02-09 19:01:53 +01:00
Julius Michaelis d5716ccc15 Added abillity to build to planet/, see CMake var BUILD_TO_PLANET 2010-02-08 21:51:48 +01:00
Nicolas Hake b1f0c3e1c6 Remove a49cc8f3de41 and add more solid fix 2010-01-24 02:48:55 +01:00
Armin Burgmeier 5dcf92121d Introduce animation stack, adapt existing scripts 2010-01-22 19:27:02 +01:00
Armin Burgmeier 8d87871a0a Fix CMake build on Linux 2010-01-12 22:09:16 +01:00
Sven Eberhardt 652481f6a1 MSVC: exclude precompiled headers from tinyxml sources 2010-01-04 03:15:50 +01:00
Armin Burgmeier fb95c3af2e Merge mesh into default 2010-01-04 01:10:31 +01:00
Sven Eberhardt d57d061b0e CMake: C4RTF.H -> C4RTF.h 2009-12-30 20:42:31 +01:00
Sven Eberhardt a8330af267 readd PROJECT_FOLDERS option to CMake 2009-12-30 20:33:04 +01:00
Tobias Zwick edec15d64f merge 2009-11-30 17:24:14 +01:00
Nicolas Hake 1a933780d4 Fix assertion and crash on game teardown (#37, #42) 
Also, the build works on linux again. Whee!
 2009-11-25 16:04:32 +01:00
Nicolas Hake 0dc14ae40e win32: Unbreak fmod, remove MCI 
USE_FMOD define renamed to HAVE_FMOD to bring it in line with HAVE_SDL_MIXER.
MCI removed since nobody was using it anyway, and half of its functions were
stubs.
 2009-11-02 14:18:47 +01:00
Nicolas Hake 1c5bf094cd Enable PCH for c4group as well 2009-10-23 15:24:12 +02:00
Nicolas Hake 1962c858f1 Add PCH handling for MSVC9 2009-10-20 06:05:49 +02:00
Nicolas Hake f0fdf5e992 Prepare for precompiled headers 2009-10-20 05:39:24 +02:00
Nicolas Hake 7b2d506869 Remove unused DInput/DSound code 2009-10-20 04:33:05 +02:00
Richard Gerum 0dac409510 merged default into mesh 2009-10-14 16:42:23 +02:00
Sven Eberhardt b8644f1853 add fmod to cmake for win32 2009-10-14 13:19:54 +02:00
Tobias Zwick 025eec0e78 merge 2009-10-11 21:57:31 +02:00
Tobias Zwick f584896446 merge 2009-10-08 20:51:31 +02:00
Sven Eberhardt 4407fb040a merge 2009-08-29 23:12:31 +02:00
Armin Burgmeier 4fa029df2c Merged default into mesh 2009-08-27 21:35:55 -04:00
Günther Brammer 1b17ad1808 Build fixes 2009-08-16 18:27:44 +02:00
Sven Eberhardt acca4a204d merge 2009-08-16 17:13:42 +02:00
Nicolas Hake 68b3b46381 cmake: Rename findlib vars to be more in line with package-provided library vars 2009-08-16 14:17:27 +02:00
Armin Burgmeier c18b11fbc6 Fixed CMake build on Unix 2009-09-20 16:03:44 -04:00
Günther Brammer 179097d389 Build fixes 
glew needs opengl32 on windows, and c4group needs zlib.
 2009-08-15 21:55:26 +02:00
Günther Brammer a28a6621da shuffle the #includes around a bit 
This reduces the dependencies from src/lib to the rest of the code a bit.
 2009-08-12 22:03:50 +02:00
Günther Brammer b46f4696e9 Split C4Rect out to its own source file 
Because much more depends on C4Rect than only C4Shape, and C4Shape uses
lots of other stuff.

Also move some other files which depend on C4Group to src/c4group, because
I'm editing the build files anyway.
 2009-08-14 01:46:32 +02:00
Sven Eberhardt df6010a148 merge 2009-08-12 17:27:43 +02:00
Nicolas Hake 1286f8d3ce msvc: Use source folders in project 2009-08-12 15:15:05 +02:00
Nicolas Hake 7b83f7a8fc Use lists for platform-specific source files instead of string interpolation 2009-08-12 15:01:14 +02:00
Nicolas Hake 921c174841 cmake: Disable test for DX SDK if USE_DIRECTX is false 2009-08-13 18:09:00 +02:00
Nicolas Hake 276a5abfed Removed default-this object parameter from a lot of functions 2009-08-12 22:44:09 +02:00
Günther Brammer 572d00c32e Move all source files 
This might make stuff easier to find.
 2009-08-10 17:59:18 +02:00
Sven Eberhardt 63311823c6 merge main branch into PlrCtrl branch (currently crashing) 2009-08-10 16:48:25 +02:00
Günther Brammer b73009e65b Cleanup 2009-08-05 00:53:38 +02:00
Armin Burgmeier 6da0846c87 Merged default into mesh 2009-07-27 21:49:33 -04:00
Nicolas Hake 07028f7bf2 CMake: Find WinSDK dir automatically 
A lot of people don't seem to have their platform SDK include and lib
directories in their environment, so cmake doesn't find the required
libs. Read the location from the registry and make it known to cmake.
 2009-07-25 22:56:06 +02:00
Nicolas Hake b0a7d4ed0d Fix problem where the DirectX SDK was not found in some circumstances 2009-07-24 00:48:41 +02:00
Günther Brammer f6b8d88a66 Update CMake build 
The proplist branch predates the CMakeLists.txt.
If I had changed the Makefile.am today, I would have remembered to test a cmake build, honest!
 2009-07-21 17:53:30 +02:00