Commit Graph

269 Commits

Author SHA1 Message Date
d7a057143d An initial Dehydra-based static analysis script for type-checking printf-style functions
This was SVN commit r7175.
2009-11-06 22:48:11 +00:00
e6f9d25925 Exclude system headers from dependency generation. (Speeds up 'make' with no file changes by ~80%)
This was SVN commit r7159.
2009-10-29 16:45:34 +00:00
f1e3468f10 Fix paths in makefile dependency generation
This was SVN commit r7157.
2009-10-23 21:41:23 +00:00
f76dc5a062 by request of sluzky: add JS files to VS workspace to allow find-in-files and open-file-in-workspace
This was SVN commit r7150.
2009-10-04 11:49:07 +00:00
a8f33553e8 cxxtestgen: More informative errors when failing to open files
This was SVN commit r7148.
2009-09-30 09:29:14 +00:00
0e4f91fab9 Detect arch from gcc, not from uname, to cope with 32-bit userspace on 64-bit kernel
This was SVN commit r7141.
2009-09-11 16:43:07 +00:00
6857e34555 Fix libpath ordering
This was SVN commit r7105.
2009-08-10 22:38:51 +00:00
e8ba28c306 Automatically build bundled external libraries and report errors if premake or an external library fails to build
This was SVN commit r7091.
2009-08-08 11:22:42 +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
e96e2e9e8d Fix Windows build issue, svn:eol-style
This was SVN commit r7084.
2009-08-07 17:43:44 +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
c7ed6c8924 Fix project type reported in comment in makefiles
This was SVN commit r7082.
2009-08-07 15:46:03 +00:00
6374080b60 # Fixed Linux execution problem. Extended unit-test system.
Fix sys_get_executable_name.
Add mock object support.
Add CxxTest wrapper to support "-test TestSuitename" and "-test
TestSuitename::test_case_name" command-line arguments for running
individual tests.

This was SVN commit r7081.
2009-08-07 15:21:39 +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
ed5fde8641 Add some GCC warnings
This was SVN commit r7049.
2009-07-28 17:01:30 +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
f1b6b40adf # Fix build issues by removing FCollada's bundled libxml2
On Windows, dynamically link to our standard libraries/libxml2/...
implementation.

This was SVN commit r7035.
2009-07-26 09:48:10 +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
21d4808de3 Only use --no-undefined link flag on Linux, because it is only present in GNU ld.
This was SVN commit r7024.
2009-07-18 22:37:03 +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
dc3ac668e0 Add --with-valgrind option to enable valgrind support, include CoreServices framework in collada plugin, use pkg-config for libxml2 config on unixes.
This was SVN commit r7017.
2009-07-18 02:04:55 +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
8da44f1908 Simplify the update-workspaces.sh script, remove some uses of absolute paths and allow the script to be run from anywhere (e.g. as ../update-workspaces.sh from the workspaces/gcc/ directory)
This was SVN commit r7011.
2009-07-17 22:07:09 +00:00
16d843a001 If HOSTTYPE is not set, try to use uname -m to detect architecture
This was SVN commit r7010.
2009-07-17 21:28:03 +00:00
10fb4c12e7 Fix update-workspaces.sh to handle paths with spaces (http://www.wildfiregames.com/forum/index.php?showtopic=12472)
This was SVN commit r7009.
2009-07-17 21:15:01 +00:00
6525cfd39e Patch from #259: [FreeBSD compat] portability fixes
This was SVN commit r7002.
2009-07-16 16:57:59 +00:00
cb240e474d Use the Unicode version of wxWidgets
This was SVN commit r6984.
2009-07-14 10:23:56 +00:00
95ca9604f1 Check that premake is up-to-date before updating workspaces
This was SVN commit r6955.
2009-07-13 16:59:10 +00:00
eb4c94e44c Define OS_LINUX when assembling assembly on linux
This was SVN commit r6954.
2009-07-13 16:35:29 +00:00
50cdce055c Of course, the elf64 hack should also only apply to linux.
This was SVN commit r6953.
2009-07-12 15:20:09 +00:00
f28ab0c473 Add premake hack to produce elf64 assembly on amd64/x86_64
This was SVN commit r6952.
2009-07-12 15:16:03 +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
d8722b897f Forward HOSTTYPE variable - this should let premake.lua detect 64-bit properly.
This was SVN commit r6947.
2009-07-12 13:50:04 +00:00
dc02482665 Added -fPIC to all Atlas libraries, to try to fix builds on Linux x86_64
This was SVN commit r6944.
2009-07-11 15:29:05 +00:00
b6ebe0645e # Minor tweaks for building on Linux
This was SVN commit r6928.
2009-06-26 21:09:56 +00:00
973c9b2165 Removed xmbcleanup (nowadays you can just delete the 'cache' directory instead)
This was SVN commit r6924.
2009-06-24 16:11:27 +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
0401cd486b Removed Collada_dbg.dll since it's outdated and not autobuilt. Added --collada option to default update-workspaces, so Collada_dbg.dll will get compiled automatically.
This was SVN commit r6793.
2009-03-27 01:45:22 +00:00
6426777e61 # Disable non-Free pathfinding library
(All the code is still there, it's just #ifdef'd out by default)

This was SVN commit r6775.
2009-03-24 21:40:10 +00:00
07a4f809d8 # Replace Xerces with Libxml2
(in Xeromyces, whose name now doesn't make much sense but oh well)

This was SVN commit r6770.
2009-03-24 00:55:35 +00:00
f74f772a41 # More libxml2
Use libxml2 for parsing in Atlas. Plus some tests for it.

This was SVN commit r6764.
2009-03-23 01:07:08 +00:00
7610d4361c # Started using libxml2
This was SVN commit r6763.
2009-03-22 20:51:35 +00:00
eec7f8fc05 # Added libxml2
This was SVN commit r6761.
2009-03-22 19:06:21 +00:00
54ab9db537 Made AoE3Ed tools optional (and disabled by default), because they're incompatible with recent DevIL
This was SVN commit r6760.
2009-03-22 17:57:11 +00:00
8c1fc507ab # Build system fixes for Linux
Use proper library names instead of hard-coded paths when linking to dll
projects, so they can be found properly at run-time

This was SVN commit r6759.
2009-03-22 16:38:27 +00:00
a483f94023 Added a default svn_revision.txt to fix the build
This was SVN commit r6753.
2009-03-19 23:20:27 +00:00
42323bf1b5 wfg icon
This was SVN commit r6660.
2009-02-07 20:04:51 +00:00
54e19e27d2 Autobuilder startup service binary
This was SVN commit r6570.
2009-01-01 22:48:05 +00:00
96eb854667 fix: output is only expanded once, so set it directly
fix path
now get version of source dir, not .

This was SVN commit r6530.
2008-12-08 07:43:07 +00:00
3da952a036 add missing DLL
move svn_revision stuff to build/svn_revision

This was SVN commit r6529.
2008-12-08 07:34:20 +00:00
12e59fd850 # groundwork for embedding svn revision number into the EXE for debugging
add svnversion from official svn cmdline client distro and its
dependencies
add a horrible batch file that reads its output and writes it to a text
file as a quoted string
(see http://www.wildfiregames.com/forum/index.php?showtopic=12104&hl=)

This was SVN commit r6528.
2008-12-07 22:21:10 +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
4a57fed5a7 Make CxxTest output on Windows go to OutputDebugString instead of stdout, so it'll appear in the VS debug output window.
This was SVN commit r6258.
2008-07-19 19:00:32 +00:00
49f0feb969 Fixed Linux build more
This was SVN commit r6168.
2008-07-01 21:43:08 +00:00
58c3b031d6 Partly fixed Linux build
This was SVN commit r6166.
2008-07-01 20:18:05 +00:00
10a6ef4e17 fix a few remnants of the previous sysdep/win folder location, including a relative path in icon.rc
This was SVN commit r6163.
2008-06-30 18:19:14 +00:00
a3696c0b91 premake: detect processor architecture from script
lib/sysdep: clean up by moving OS and cpu-arch folders into "os" and
"arch" folders

This was SVN commit r6162.
2008-06-30 17:34:18 +00:00
2382899a87 add system-specific AllocateAligned call (because _mm_malloc isnt as portable as hoped)
("RTL" directly has been added to sysdep - requires update of workspace)

This was SVN commit r6156.
2008-06-29 10:30:33 +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
6b51050f96 Updated Premake to generate VS2008 project files.
This was SVN commit r6127.
2008-06-28 00:49:38 +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
bafc8d0cfa lib code requires a macro to be set, otherwise it thinks it's being used in a DLL (rebuild workspace required)
This was SVN commit r5953.
2008-05-13 19:34:16 +00:00
6e46b897c9 add new source directory to premake list (-> update_workspace required)
This was SVN commit r5950.
2008-05-13 05:44:23 +00:00
9cde0f45b7 remove some DLLs from the delayload list that shouldn't be there (DL doesn't make sense)
[this is a good time because the next commit requires workspace rebuild
anyway]

This was SVN commit r5882.
2008-04-13 14:48:10 +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
f5890de017 part5: update build system to reflect new directories in the source tree.
workspace needs to be updated.

This was SVN commit r5520.
2007-12-20 20:22:01 +00:00
23a1c6196f incorporate allocators/ into build
the old lib/allocators.h is now a bridge to the new headers (temporary)
make slight interface changes in lib/res/file to match new allocators
interface

This was SVN commit r5445.
2007-11-10 13:55:32 +00:00
29e5130153 Updated required libraries to include some AtlasUI libs.
This was SVN commit r5437.
2007-11-10 02:58:23 +00:00
6bbd564910 Updated Ubuntu instructions.
This was SVN commit r5436.
2007-11-09 19:17:42 +00:00
57ac4228d1 Updated build instructions for Linux and commented out visibility options
that make GCC 4.1 fail to link the game.

This was SVN commit r5435.
2007-11-09 18:48:23 +00:00
kai
e595dbc88e pathfinding change: the engine uses Triangulation and A* on triangles now. dcdt package added. premake.lua changed to include the dcdt code. it needs to run update-workspaces.bat (flag -showOverlay will draw the triangulation and a single unit paths)
This was SVN commit r5393.
2007-10-09 07:27:45 +00:00
7421fa79ba move archive-related files to their own directory (res/file was way too cluttered.. vfs will probably also be separated.)
This was SVN commit r5387.
2007-10-03 09:48:45 +00:00
4b481bdd2c avoid "directory already exists" warning.
allow skipping generating the vc2003 or vc2005 projects by creating a
file SKIP_PREMAKE_HERE in that workspace directory

This was SVN commit r5386.
2007-10-03 09:43:00 +00:00
ea791fc6ef add new sysdep linux dir to build (requires rebuilding the workspace)
This was SVN commit r5366.
2007-09-23 16:14:49 +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
08d3ff2952 Updates for OS X and gcc 4.0 compatibility.
- Fixed some invalid member function references in wxJS code that gcc
4.0 didn't like.
- Some conversion changes.
- Don't try to construct wxSound from memory in OS X (it's not
available).
- Added dependency on zlib in AtlasUI (something there uses _compress).
- Added Mac code for finding current executable's path.
- Added dummy code for getting display size that does not use X.
- Fixed dir_get_changed_file stub to return ERR::AGAIN (end of files)
instead of INFO::OK.

This was SVN commit r5312.
2007-09-02 16:50:20 +00:00
b65d1f8756 Replaced wxWidgets-devel with wxWidgets, which works better.
This was SVN commit r5311.
2007-08-30 17:52:57 +00:00
5e39585359 Added Mac build instructions using MacPorts.
This was SVN commit r5310.
2007-08-29 07:45:55 +00:00
d9702ca590 Added dependency on comsuppw to fix VC2005 build.
This was SVN commit r5216.
2007-06-30 16:45:24 +00:00
ec9b5c982e Replaced Windows SpiderMonkey library with a threadsafe build of version 1.6.
Fixed linking with wxWidgets.
Enabled RTTI for non-engine packages.
Fixed wxJS for Windows.
Fixed failure to load on Windows 2000 due to IsWow64Process import.
Fixed trivial warnings.

This was SVN commit r5155.
2007-06-09 02:40:48 +00:00
4fbaea3780 # fix for exceptions when not running in debugger
move exception-specific stuff into wseh. it now grabs the entry point
and wraps it in a __try block (but only for the main EXE).
this works around issues with the previous SEH registration code
(exceptions weren't caught in release mode when not running in debugger)

This was SVN commit r5151.
2007-06-08 17:44:24 +00:00
2405a98b58 fix for immediate exit in autobuilt EXE
(problem was the vc7 linker stripping out stuff that we needed)

This was SVN commit r5149.
2007-06-07 19:32:13 +00:00
914e5f7c2f Rename stdafx.h to precompiled.h
This was SVN commit r5146.
2007-06-05 18:35:05 +00:00
4e83672579 # Added scripting support to the scenario editor UI
Added modified version of wxJavaScript.
Added Atlas script interface.
Rewrote the Map sidebar in JS.

This was SVN commit r5144.
2007-06-05 18:16:55 +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
c3de4710d3 Reverted update-workspaces.bat
This was SVN commit r5127.
2007-06-02 15:24:20 +00:00
cf89464e64 # autobuilder fix
detours is configured as a static lib, which would require using the
same compiler, but we have several in action.
fix: include a stripped down version of its code in the main source tree

This was SVN commit r5126.
2007-06-02 12:43:42 +00:00
6b6b6198f9 # Linux ICC compatibility.
Don't disable PCH in AtlasUI for non-GCC builds.
Prevented some excessive warnings ("implicitly-signed bit field of
length 1").
Removed (wcs|str)nlen functions on OS_UNIX, since they were already
removed from the .h.

This was SVN commit r5125.
2007-06-01 00:34:36 +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
9d2acce9d8 # SwEng/cleanup
- deleted most old libraries/headers in codepit to avoid confusion (they
are now in SVN anyway). updated required-libraries-linux.txt accordingly
- moved rand() into separate file, out of lib.cpp
- removed CGUIScrollBarStyle.cpp to avoid empty-file warning
- wxwidgets.h: remove redundant #pragma lib and include wxw PCH
- move openal-specific stuff to external_libraries/openal.h
- cpu, bsd: macosx is-a bsd, so only test OS_BSD

This was SVN commit r5082.
2007-05-18 00:14:26 +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