1
0
forked from 0ad/0ad
Commit Graph

365 Commits

Author SHA1 Message Date
37dad6eb62 This was SVN commit r10084. 2011-08-24 02:54:31 +00:00
f9dc6d9d69 Removes superfluous test build configuration from premake4.
This was SVN commit r10082.
2011-08-24 00:15:00 +00:00
8872bad668 AoEO BAR compatibility in AoE3Ed
This was SVN commit r10026.
2011-08-17 16:17:22 +00:00
fab7bf4fcf Fixes manifest dependencies for Actor Editor. Fixes #924.
This was SVN commit r10018.
2011-08-16 22:08:47 +00:00
819f354cca Removes Devil. Fixes #666.
Adds no_delayload to OpenAL, which has been causing startup problems.

This was SVN commit r9989.
2011-08-10 23:15:40 +00:00
d605e85ae5 Removes ColourTester utility (needs update-workspaces).
Adds busy cursor to Atlas map generator.

This was SVN commit r9987.
2011-08-10 22:23:35 +00:00
840a404952 Regenerate makefiles for modified Premake using unmodified Premake, for OS X compatibility
This was SVN commit r9878.
2011-07-18 21:42:41 +00:00
9edfe0fbcd Fix clean-workspaces script for new SpiderMonkey
This was SVN commit r9876.
2011-07-18 17:32:07 +00:00
2f0bd8d8b0 Upgrade to SpiderMonkey 1.8.5 (fixes #734)
This was SVN commit r9852.
2011-07-16 23:24:14 +00:00
c7ba150c40 Fix handling of update-workspaces arguments on Windows
This was SVN commit r9849.
2011-07-16 22:17:47 +00:00
0aba4006cc Fix object path for .asm files in VC200x
This was SVN commit r9837.
2011-07-15 22:48:37 +00:00
e8e4d37c8d Set up manifest via linkoptions for test executable
This was SVN commit r9836.
2011-07-15 22:45:50 +00:00
b551a744cc Premake4 binary for Windows
This was SVN commit r9833.
2011-07-15 19:01:50 +00:00
1e470d37ff Pre-generated Premake4 build files
This was SVN commit r9832.
2011-07-15 18:55:36 +00:00
befba20acb Fix Makefile dependency generation.
Fix PCH dependency to work with parallel builds.

This was SVN commit r9831.
2011-07-15 18:51:18 +00:00
0dc3ae487d Premake4 build scripts for the game, from Yves (plus minor tweaks)
This was SVN commit r9830.
2011-07-15 17:56:57 +00:00
76ff2cc83a Non-standard Premake4 patches from Yves (plus minor tweaks).
Add nasm support.
Add cxxtest support.
Some other fixes.

This was SVN commit r9829.
2011-07-15 17:48:21 +00:00
fcab9e3b5e Import Premake4 source (rev fc0374a03b17), minus samples/ and packages/
This was SVN commit r9828.
2011-07-15 17:32:06 +00:00
e9b3bcf467 Disable building Atlas by default on OS X
This was SVN commit r9766.
2011-07-06 20:14:25 +00:00
0c803f99e8 This was SVN commit r9609. 2011-06-09 23:47:20 +00:00
266977bc78 Attempt to fix manifest problems in autobuild.
This was SVN commit r9607.
2011-06-09 23:16:27 +00:00
c2677b4bb0 Upgrade game and build system to ENet 1.3
This was SVN commit r9574.
2011-05-29 20:57:28 +00:00
acb48663d7 Windows fixes
This was SVN commit r9570.
2011-05-29 18:14:52 +00:00
a81f180dd6 Remove Atlas UI scripting support
This was SVN commit r9567.
2011-05-29 15:43:08 +00:00
dc2035efc9 Move Atlas map settings from JS to C++.
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.

This was SVN commit r9566.
2011-05-29 15:02:02 +00:00
07e307c49a Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741
This was SVN commit r9559.
2011-05-27 21:56:43 +00:00
1075e206f7 Fix some format string errors
This was SVN commit r9534.
2011-05-18 19:10:36 +00:00
962fb41729 Support parallel build jobs in update-workspaces (via JOBS=-j3 or argument -j3 etc)
This was SVN commit r9418.
2011-05-03 23:54:29 +00:00
5ca66fc757 cleanup: move ADTs into lib/adts (separate files). fix definition of ASSERT
This was SVN commit r9364.
2011-04-30 13:35:36 +00:00
ad6f305359 Integrates random maps with Atlas. Fixes #460.
Adds various map controls to Atlas.
Adds New Map dialog to Atlas.
Removes a few references to old simulation header files.

This was SVN commit r9247.
2011-04-14 04:01:59 +00:00
06a088efa8 Replace libcurl with a self-compiled (in VC2005) copy of 7.21.4 with no SSL/zlib support, in an attempt to fix errors on 64-bit Windows
This was SVN commit r8941.
2011-02-19 18:44:09 +00:00
0da7e822ff # Add opt-in automatic feedback system.
Add GL implementation limits to hwdetect.
Make the in-game manual support multiple text files.
Remove unnecessary instruction on how to close the manual window.
Make guitextobject.caption return the original value without stripping
formatting tags.
Remove unused non-VFS support from config system.
Support writing config files back to their original path.
Remove unnecessary user profile directory; use normal config directory.

This was SVN commit r8925.
2011-02-16 20:40:15 +00:00
1c3c962ea1 Import libcurl for Windows
This was SVN commit r8924.
2011-02-16 11:22:34 +00:00
0d8ffa58dc AoE3Ed build fixes
This was SVN commit r8868.
2011-01-17 13:29:45 +00:00
ba2a9d7af3 improvements from work: [update-workspaces required]
- split precompiled.h into several headers (simplifies reuse)
- enable additional warnings not in W4
- split ErrorReaction into ErrorReactionInternal - clarifies which
values can actually be returned by debug_DisplayError
- wsdl: slightly safer HDC usage via CS_OWNDC, avoid dipping into DC
cache via ValidateRect instead of BeginPaint; remove unused thread
create
- StdDeserializer - wasn't including byte_order => BYTE_ORDER was
undefined
- wsysdep: clean up error dialog message handling

This was SVN commit r8828.
2010-12-09 11:16:21 +00:00
bee013b586 Define CONFIG_FINAL in Release builds, to enable better compression in codec_zlib.cpp
This was SVN commit r8740.
2010-11-29 12:51:45 +00:00
94dca529b1 Fix OS X build errors
This was SVN commit r8684.
2010-11-23 19:20:03 +00:00
b13e6ae293 Fix script to rebuild SpiderMonkey properly
This was SVN commit r8633.
2010-11-17 00:58:10 +00:00
93861485fb Add a script to clean up broken builds of bundled libraries
This was SVN commit r8632.
2010-11-17 00:50:38 +00:00
83285504cb Disable RTTI in test project, for consistency
This was SVN commit r8565.
2010-11-10 15:26:29 +00:00
6935a03743 remove no-longer needed GLU dependency; avoids delay-load warning.
This was SVN commit r8555.
2010-11-08 10:42:34 +00:00
818ea52c3b Delete obsolete non-working i18n code
This was SVN commit r8527.
2010-11-03 17:52:07 +00:00
ec5d4a9f9e Attempt to fix build error with intrinsics on 32-bit Linux
This was SVN commit r8526.
2010-11-03 02:06:38 +00:00
dd3bf54e4c Add translation to desktop file (see #492)
This was SVN commit r8310.
2010-10-08 14:08:54 +00:00
7b6775ee9f Fix building with NVTT
This was SVN commit r8309.
2010-10-08 10:42:23 +00:00
6b5b35c245 Remove BFD-based debugging code, to avoid the runtime dependency on binutils.
Fixes #581.

This was SVN commit r8271.
2010-10-04 17:21:55 +00:00
aadbf53a2a Add nvtt to build system
This was SVN commit r8093.
2010-09-10 20:15:49 +00:00
d922034a8e Replace Windows installer bitmap
This was SVN commit r7969.
2010-08-15 14:56:01 +00:00
6707e6cf6b Use non-debug executable for Linux packages.
This was SVN commit r7968.
2010-08-15 12:23:11 +00:00
025b7960f8 Suggest more Debian-compatible install paths
This was SVN commit r7945.
2010-08-14 19:39:50 +00:00
9c47c61ea9 Spell nasm options in a way that's compatible with old versions of yasm
This was SVN commit r7893.
2010-08-10 19:48:12 +00:00
422da1aef0 Add resources for Linux packages, based on files from fabio (see #492)
This was SVN commit r7882.
2010-08-08 22:13:10 +00:00
29d3f824e0 Remove obsolete CppDoc files
This was SVN commit r7819.
2010-07-29 20:43:24 +00:00
797e2bb491 NSIS-based installer for Windows. Fixes #519.
This was SVN commit r7812.
2010-07-26 23:38:46 +00:00
2375c7cb95 Add bindir/datadir/libdir options, to find files when the game is installed in standard FHS locations
This was SVN commit r7758.
2010-07-14 19:39:47 +00:00
1ea8ab60ee Compile with -Wundef to detect stupid macro typos like "GCC_VER"
This was SVN commit r7756.
2010-07-14 15:54:39 +00:00
bad3d04bc0 Fix some Premake warnings
This was SVN commit r7755.
2010-07-14 13:53:26 +00:00
20c50d32d4 Windows fixes.
Avoid Boost.Random since it adds a dependency on a new library.

This was SVN commit r7654.
2010-06-30 23:40:51 +00:00
1c0536bf08 # Refactored the networking code, and redesigned the game setup screen.
Major updates to most network classes.
Simplify CNetServer so it doesn't duplicate any client behaviour; all
players now run CNetClient.
Remove most player/slot management from networking code.
Wait for all players to finish loading before starting the simulation.
Remove CGameAttributes; attributes are now just a JS object.
Remove CPlayer; they are now just simulation entities.
Handle player colours via simulation system.
Add a default map for Atlas, so it always has something to load.
Move network documentation to Doxygen.
Remove lots of now-unused code.

This was SVN commit r7653.
2010-06-30 21:41:04 +00:00
f066daf21d update zlib, libpng; rebuild libjpg (avoids dependency on msvcr71)
update-workspaces required.

This was SVN commit r7630.
2010-06-21 11:54:15 +00:00
7eeacaab2d Fix building on Windows in paths containing space characters. Fixes #482, based on patch from Zoomastigophora.
This was SVN commit r7625.
2010-06-10 19:15:33 +00:00
a18aa24fe3 Windows support for window resizing and fullscreen toggling.
Windows build fixes.

This was SVN commit r7607.
2010-06-03 21:15:45 +00:00
47ca9fc6cb Autobuild fixes (untested)
This was SVN commit r7597.
2010-05-30 15:18:24 +00:00
5b9d29729a Windows fixes
This was SVN commit r7592.
2010-05-27 23:51:14 +00:00
64a610baab Add some code for rough testing of state hashing performance.
Simplify the code needed for tests based on real maps.

This was SVN commit r7574.
2010-05-25 17:28:26 +00:00
80229cdea7 Remove unused DCDT library
This was SVN commit r7556.
2010-05-20 18:32:03 +00:00
56bb858802 # Delete a lot of obsolete simulation code.
This was SVN commit r7555.
2010-05-20 18:09:23 +00:00
202b13d557 Fix the calling conventions properly this time (I hope)
This was SVN commit r7542.
2010-05-13 16:22:07 +00:00
22a7a6396b Revert deletion of compile flag that apparently is actually needed (see #424).
This was SVN commit r7538.
2010-05-11 13:56:04 +00:00
3c75dba1b8 Clean up some svn:executable flags
This was SVN commit r7518.
2010-05-08 23:17:08 +00:00
4ea28cf809 OS X Atlas build fix. Fix wcsdup emulation. Remove seemingly unneeded compile flag (closes #424).
This was SVN commit r7513.
2010-05-07 23:09:36 +00:00
0429c113ab Tell nasm to use macho64 when appropriate
This was SVN commit r7475.
2010-04-21 20:56:32 +00:00
701fcc18a6 Attempt to make build system's CPU architecture detection slightly less broken
This was SVN commit r7458.
2010-04-15 20:15:16 +00:00
0efef76f7d disable delay-loading of version.dll.
Of the delay-loaded DLLs, version.dll is the only one that is used in
proximity to WoW64 FS redirection, which apparently has a dangerous
interaction with delay-loading. This should prevent #484 (after
update-workspaces + a rebuild), but we can't be sure due to lack of an
x64 Vista or Win7 machine for testing. Can someone please confirm that
it works without requiring the -quickstart workaround?
refs #484

This was SVN commit r7453.
2010-04-10 17:26:10 +00:00
7abb71f265 Use optimised FCollada on Unix non-debug builds. Fixes #207.
This was SVN commit r7429.
2010-04-03 11:27:24 +00:00
0d6882dad2 # Fix the actor viewer in Atlas.
Delete the old standalone actor viewer.
Import some terrain textures that are useful for tools.
Fixes #483.

This was SVN commit r7428.
2010-04-03 11:07:42 +00:00
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
9b6326f124 Always build with Valgrind support. Always use the bundled Valgrind header.
This was SVN commit r7397.
2010-03-26 10:31:47 +00:00
a902b7a2f4 Remove obsolete undocumented line-fixing tool
This was SVN commit r7394.
2010-03-24 20:01:39 +00:00
0670638198 Remove obsolete build instructions (see BuildInstructions page instead)
This was SVN commit r7393.
2010-03-24 19:54:01 +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
5118d6ab32 Restrict rpath usage to Linux
This was SVN commit r7386.
2010-03-21 18:40:22 +00:00
55adcfc595 Use better rpath for finding libraries on Linux
This was SVN commit r7376.
2010-03-20 18:45:55 +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
17718981cf Remove Crypto++ because it causes too much trouble. Replace with a custom MD5 implementation for simulation state hashing.
This was SVN commit r7269.
2010-01-10 19:29:27 +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
c8fed35c52 Remove -ffast-math. (Better to focus on correctness by default, and only sacrifice it for performance in limited profiler-indicated areas.)
This was SVN commit r7246.
2010-01-05 20:54:33 +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
503341ae4c Stop Premake's Makefile calling Premake to remake its Makefile, before making Premake
This was SVN commit r7218.
2009-12-05 23:57:58 +00:00
835c0d05b0 Disable -fomit-frame-pointers in optimised builds, so that oprofile callgraph works
This was SVN commit r7208.
2009-11-20 12:56:11 +00:00
f7e16d9f3e Code coverage measurement support (with lcov)
This was SVN commit r7203.
2009-11-16 21:23:43 +00:00
beb3417b03 Build and link with the more correct -pthread option on Linux, instead of -lpthread
This was SVN commit r7193.
2009-11-13 20:24:21 +00:00
259f3990df Fix inconsistency in Dehydra script
This was SVN commit r7182.
2009-11-07 13:38:31 +00:00
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