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
Armin Burgmeier
e52a4364b6
Added StdMesh data structures
...
Loading code is still to be written
2009-07-09 00:01:15 +02:00
Armin Burgmeier
9f35ffe470
Added TinyXML
2009-07-08 22:53:49 +02:00
Nicolas Hake
0d08565059
[MSVC9] Enable minimal rebuild and edit-and-continue
2009-07-12 18:46:54 +02:00
Nicolas Hake
532e58c2ff
Remove unknown parameter warning from MSVC build
2009-07-11 19:44:14 +02:00
Nicolas Hake
14e8d4794d
Fix linux CMake build
...
Not tested: Cross compiling, might need to be implemented into CMakeLists
2009-07-11 03:14:57 +02:00
Nicolas Hake
2a38d0056d
Strip c4group of unnecessary code dependencies
...
Fixes issue #21 (c4group build failure)
2009-07-08 19:54:54 +02:00
Nicolas Hake
4649547c97
Fix MSVC build
2009-07-06 04:40:57 +02:00
David Dormagen
199cf0d5a6
CMake-pthread-fix for WIN32 builds
2009-07-03 14:19:31 +02:00
Nicolas Hake
8466407a60
Updated CMakeLists to work with precompiled dependencies
2009-07-01 22:25:45 +02:00
Günther Brammer
009cfc9e7b
Remove C4Wrappers and put most functions in relevant headers
...
This also removes the TickXXX #defines and moves the lookup of predefined
materials to C4Material.
2009-06-12 20:52:21 +02:00
Günther Brammer
fc7d8425ba
Linux: Add CMake support
...
CMake produces a config.h which defines the macros as empty strings instead
of 1, so some #ifs have to be adapted.
2009-05-29 23:05:50 +02:00
Günther Brammer
cc34bdc07c
Windows: Replace vc9 and codeblocks build files with CMake
2009-05-29 22:53:15 +02:00