Commit Graph

51 Commits

Author SHA1 Message Date
f4c8225dd4 Slightly hacky attempt to fix OS X include path order so it hopefully doesn't get confused by a MacPorts SpiderMonkey
This was SVN commit r7419.
2010-03-31 20:40:45 +00:00
1e7b36d54b # OS X build fix.
Use sdl-config instead of pkg-config.

This was SVN commit r7387.
2010-03-21 19:36:35 +00:00
23a702c335 # OS X build fixes.
spidermonkey-tip script fix.
GCC 4.2 compatibility.
Remove redundant code in extern_libs.lua

This was SVN commit r7371.
2010-03-20 16:26:25 +00:00
ed69187450 Build with spidermonkey-tip by default. Remove codepaths for old SpiderMonkey.
This was SVN commit r7366.
2010-03-19 20:54:44 +00:00
e7e8b8dbc3 Fix spidermonkey-tip to build on Windows. Add precompiled binaries.
This was SVN commit r7365.
2010-03-19 20:28:22 +00:00
99fc76e7dd Update spidermonkey-tip to recent version
This was SVN commit r7363.
2010-03-19 19:26:41 +00:00
7c2e9027c2 # Rewrite of the game's simulation system
Giant merge from
http://svn.wildfiregames.com/hg-source/file/5fb522019d5e
Infrastructure is largely complete, gameplay is largely missing
Disabled by default; use command-line flag "-sim2"
(Second attempt at commit...)

This was SVN commit r7259.
2010-01-09 19:20:14 +00:00
00409b9583 # Support latest version of SpiderMonkey
Add --with-spidermonkey-tip option to Premake

This was SVN commit r7230.
2009-12-28 16:45:42 +00:00
6857e34555 Fix libpath ordering
This was SVN commit r7105.
2009-08-10 22:38:51 +00:00
b59ba962df Use internal spidermonkey by default on unices. Extract a helper for pkgconfig-based libraries. Add support for dependencies between external libraries and use that to link nspr in all projects that use the spidermonkey.
This was SVN commit r7085.
2009-08-08 09:56:50 +00:00
5c8861adf4 Remove redundant -L linker arguments on non-Windows.
Fix some compiler warnings.
Fix missing non-PCH headers.

This was SVN commit r7083.
2009-08-07 17:22:05 +00:00
c66dfd11d0 Fix typo in last commit
This was SVN commit r7079.
2009-08-07 12:22:56 +00:00
935efedacf OS X build fix (fixes #265)
This was SVN commit r7078.
2009-08-07 07:58:32 +00:00
65d3bd642c Fix linking problems on Linux (patch from Christian Ruppert (idl0r))
This was SVN commit r7077.
2009-08-06 19:41:18 +00:00
75e0d4511c Don't use the bundled enet headers on non-Windows (we need it installed as a system library anyway, so we can link to it)
This was SVN commit r7038.
2009-07-26 16:28:12 +00:00
26effc4f99 # premake 3.7 compatibility fixes
from patch suggested by Cilyan

This was SVN commit r7028.
2009-07-21 17:38:27 +00:00
717db156fc Link with -Wl,--no-undefined to detect errors at compile time
This was SVN commit r7022.
2009-07-18 19:55:27 +00:00
abf84b25f8 pkg-config actually gives buildoptions, not includepaths
This was SVN commit r7020.
2009-07-18 02:55:31 +00:00
ec1dac1ff4 OS X changes: allow linux_names or osx_names which will override unix_names, use it to include boost_system on OS X (it doesn't seem to exist on linux). Also changed libxml2 unix config to use pkg-config instead of hardcoded paths.
This was SVN commit r7016.
2009-07-18 02:03:29 +00:00
cb240e474d Use the Unicode version of wxWidgets
This was SVN commit r6984.
2009-07-14 10:23:56 +00:00
89b687de6f Include the name of the missing library in the error message
This was SVN commit r6951.
2009-07-12 14:58:05 +00:00
d9bb1a7447 remove dbghelp and directx libraries (not redistributable)
move dbghelp and powrprof-specific stuff into external_libraries
dbghelp: dynamically import functions to avoid needing the .lib

This was SVN commit r6912.
2009-06-20 17:50:43 +00:00
eec7f8fc05 # Added libxml2
This was SVN commit r6761.
2009-03-22 19:06:21 +00:00
09f97a3422 Some fixes for OS X:
- Find enet properly
- Type conversion of size_t's in JS

This was SVN commit r6324.
2008-08-11 04:18:10 +00:00
1ec9b00a00 remove test_1_run from solution, rename the other test projects.
see http://www.wildfiregames.com/forum/index.php?showtopic=11828

extern_libs.lua: add comment

This was SVN commit r6147.
2008-06-28 20:22:49 +00:00
b488340f22 add debug symbols for enet (rationale: see enet/lib/rationale.txt)
requires update of workspace.

This was SVN commit r6145.
2008-06-28 20:02:05 +00:00
2118c3ccfe (no rebuild of workspace is required)
avoid linker warning about delay-loading enet
remove done TODO comment

This was SVN commit r6141.
2008-06-28 17:53:37 +00:00
a845570fef add enet to external library definitions and add it as a dependency of the network and engine subsystems.
(required for dacian's new netcode)
warning: enet isn't yet compiled on OS X and linux

This was SVN commit r5997.
2008-05-31 20:00:37 +00:00
6541294ebf More Linux build fixes
This was SVN commit r5539.
2008-01-08 00:09:52 +00:00
5768b9b8ab remove ddraw dependency, use wmi instead
This was SVN commit r5531.
2007-12-29 16:20:23 +00:00
264f394f17 Moved X11 stuff out of unix/ folder, added osx/ sysdep folder, corresponding premake.lua changes, and a few misc other Mac OS X-related changes
This was SVN commit r5320.
2007-09-03 12:56:45 +00:00
eea76e7d9d Added Valgrind headers.
Changed ICC PCH arguments to the form that's not deprecated in ICC 10.

This was SVN commit r5319.
2007-09-02 23:41:06 +00:00
d9702ca590 Added dependency on comsuppw to fix VC2005 build.
This was SVN commit r5216.
2007-06-30 16:45:24 +00:00
db189468a9 (update-workspace required)
found another means of doing startup/shutdown that doesn't require
hooking and allows init callbacks to use CRT functions (avoiding
problems similar to the recent rash of pre-libc bugs). also, callback
registration no longer needs ugly #pragma syntax.

remove 'Detours' (evil and no longer needed)

This was SVN commit r5137.
2007-06-04 00:00:57 +00:00
d90975ee1e # Slightly improved Linux compatibility for Atlas.
Properly enabled PCH in GCC.
But wx 2.8 (with anonymous namespaces) and GCC <4.2 and PCH conflict, so
PCH is disabled when building AtlasUI on broken compiler versions.
Removed media player, because it's useless and makes building harder.
Removed unnecessary wx linking.

This was SVN commit r5122.
2007-05-31 01:47:17 +00:00
7fe6c3d77f add detours library for API hooking.
(update aken driver while at it)

This was SVN commit r5107.
2007-05-28 15:01:29 +00:00
349d9b9afe add whrt dir, remove winmm delayload and dsound dependency
(workspace must be updated)

This was SVN commit r5095.
2007-05-26 17:17:47 +00:00
7d4af5979b Fixes for the Mac.
# The engine now builds and runs on Mac OS X.

Most changes were localized to the sysdep/ folder and the build system.
This
is what porting should be like! Hopefully nothing breaks on the other
platforms though ;-)

This was SVN commit r5081.
2007-05-17 03:37:49 +00:00
31a60bf1d8 - debug version of xerces libs and updated headers
- update premake for wxw 2.8 and make some required fixes in
VideoRecorder.cpp

This was SVN commit r5068.
2007-05-13 10:27:48 +00:00
d69a0c52bb update OpenAL include/lib from SDK (nothing really changed in the header)
add crypto++ to libraries (will later be used for checksums)

This was SVN commit r5058.
2007-05-11 09:41:46 +00:00
ccf4425f75 # Linux fixes
update-workspaces.sh: Ensure 'gcc' directory exists, to avoid confusing
errors.
extern_libs.lua: Don't use libraries/ (except for cxxtest and fcollada)
on Linux. Changed to native EOL.

This was SVN commit r4991.
2007-04-24 20:41:54 +00:00
49efe728fd Added binaries and some example data for COLLADA conversion.
Added FCollada 3.02 library files (but Collada*.dll is not built by
default since it doesn't work in VS2003 (because the FCollada*.dll files
use the VC80 CRT)).
Changed Premake to use optimize-speed instead of optimize, since the
latter does /Ox (in MSVC) which is kind of unofficially deprecated.

This was SVN commit r4935.
2007-03-01 22:34:38 +00:00
236224eea9 # Updated video encoding library.
(in particular the one file that I'd forgotten about when updating the
rest)

This was SVN commit r4928.
2007-02-25 22:08:31 +00:00
13f2e3ca0c Tried compiling with ICC9 on Linux, which raised various issues:
* Fixed some bugs with incorrect macro usage (SDL_BYTE_ORDER vs
SDL_BYTEORDER, {MSC,GCC}_VER vs {MSC,GCC}_VERSION, OS_WIN/OS_UNIX in
projects where they're not defined).
 * Removed some redundant declarations of g_Console.
 * Removed some unnecessary semicolons.
 * Removed some unused variables.
 * Added throw specification to operator new.

This was SVN commit r4698.
2006-12-16 01:01:15 +00:00
da266ebcb8 GCC compatibility for COLLADA converter
This was SVN commit r4683.
2006-12-06 17:39:49 +00:00
8fa6b12568 # Initial COLLADA support.
Just does static geometry at the moment.

This was SVN commit r4680.
2006-12-06 00:06:05 +00:00
2c71c22045 # Added basic video recording.
* Included FFmpeg library for video encoding. (LGPL, dynamically
linked.)
 * Added 'record' button to cinematics - plays the selected track at a
fixed framerate, and saves the output to a video file (preferably
MPEG4). Slightly lacking in reliability and features (fixed at 640x480,
no choice of codec, probably crashes horribly if any problems occur
while encoding, etc).
 * Moved icon bitmaps out of mods directory. Added 'record' icon.

This was SVN commit r4676.
2006-12-05 02:35:00 +00:00
05c9525fdc update-workspaces.sh: generate atlas makefiles by default
*.lua: some extra libraries and options to make atlas work
premake:
- fixed #156 (creation of spurious dirs with strange permissions)
- implemented the "run" project kind to run the tests automatically
- changed the clean target for cxxtestgen projects to delete the
generated .cpp
files so that a make clean all actually regenerates the tests.

This was SVN commit r4639.
2006-11-12 03:39:40 +00:00
c59de80915 # Integrated our new unit testing framework with premake to get automated testing after every re-compile.
Trac #117

This was SVN commit r3975.
2006-06-07 22:19:42 +00:00
8ebf16749f fix: don't use debug mode suffix on *nix
This was SVN commit r3962.
2006-06-07 04:44:21 +00:00