Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
20,219 Commits 5 Branches 28 Tags 13 GiB
3af575abd0
Commit Graph

572 Commits

Author SHA1 Message Date
historic_bruno
2c3c8737e0 OS X libs build script improvements: 
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0

This was SVN commit r14356.
 2013-12-15 02:14:45 +00:00
historic_bruno
99f44ff7a0 Reorganizes extern libs in alphabetical order 
This was SVN commit r14355.
 2013-12-15 01:34:16 +00:00
JoshuaJB
8dab478691 Bundle miniUPnPc with 0AD. 
This was SVN commit r14333.
 2013-12-13 02:59:35 +00:00
JoshuaJB
667537ee49 UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305 
This was SVN commit r14332.
 2013-12-13 02:23:02 +00:00
historic_bruno
d672d9625d Changes update-workspaces.bat to not generate a vc2013 workspace by default, since the game won't successfully build yet, refs #2271 
This was SVN commit r14210.
 2013-11-17 23:11:56 +00:00
Yves
294aa142d8 Fixes compiling with the flag "--without-lobby". 
Refs #2267

This was SVN commit r14203.
 2013-11-17 11:52:11 +00:00
Yves
6fba293088 In #2241 I'm going to change the GUI to have one ScriptInterface for each GUI page because that will be required for the Spidermonkey upgrade (#1886). 
The Multiplayer lobby needs some changes to avoid compartment
mismatches. Instead of initializing it with a ScriptInterface and
storing script values at different locations, it takes a ScriptInterface
argument in the functions that really need to read or write some script
values and avoids storing values as script values with an associated
compartment where possible.
The scripting interface of the lobby is also adjusted to use
JSInterface_Lobby.h/cpp files as other components instead of adding all
functions to ScriptFunctions.cpp. This makes it a bit more clearly
arranged IMO.

Fixes #2267
Refs #2241
Refs #1886

This was SVN commit r14199.
 2013-11-16 18:38:40 +00:00
Ykkrosh
bd900362ea Rebuild premake4.exe with VC++ 2008 again, so that it works on WinXP/2003 
This was SVN commit r14164.
 2013-11-13 21:16:06 +00:00
historic_bruno
3d8865f10b Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444). 
Fixes lobby build on OS X.
Fixes zlib not building as static lib.

This was SVN commit r14142.
 2013-11-11 04:41:44 +00:00
historic_bruno
011cbb5725 Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions) 
This was SVN commit r14139.
 2013-11-11 00:09:16 +00:00
historic_bruno
5c2c7248b1 Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple. 
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.

This was SVN commit r14138.
 2013-11-11 00:04:07 +00:00
historic_bruno
9cc172b164 Fixes --without-lobby for MSVC and clang, refs #2249. 
Cleans up some whitespace.
Removes obsolete PCH files.

This was SVN commit r14117.
 2013-11-09 02:57:10 +00:00
leper
81cf02cc13 Fix building with --without-lobby. Fixes #2249. 
This was SVN commit r14113.
 2013-11-08 15:28:44 +00:00
RedFox
1a32a10f52 Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP. 
This was SVN commit r14111.
 2013-11-08 14:08:16 +00:00
Ykkrosh
1138419017 Remove broken build script 
This was SVN commit r14106.
 2013-11-07 22:20:38 +00:00
JoshuaJB
8d5d66e57b Fix error that slipped into the lobby commit. 
This was SVN commit r14099.
 2013-11-07 20:10:59 +00:00
JoshuaJB
bffe917914 Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby. 
This was SVN commit r14098.
 2013-11-07 20:07:24 +00:00
JoshuaJB
d7121f4f55 glooxwrapper by Philip to support building gloox on Windows. 
This was SVN commit r14097.
 2013-11-07 19:38:09 +00:00
JoshuaJB
10e23c173d Add gloox library files. 
This was SVN commit r14096.
 2013-11-07 19:04:30 +00:00
JoshuaJB
3298dce158 Remove the unused crypto++ library. 
This was SVN commit r14093.
 2013-11-07 18:49:43 +00:00
Ykkrosh
29e4b1a17c Update Android support 
This was SVN commit r14068.
 2013-11-02 23:05:38 +00:00
JoshuaJB
e2f475b86a Make the *nix ARM support a little sturdier, Fixes #2121 
This was SVN commit r14050.
 2013-10-27 21:06:15 +00:00
historic_bruno
3a28caed03 Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP 
This was SVN commit r13994.
 2013-10-12 23:47:09 +00:00
Ykkrosh
e2d28c8894 Add AppData file, for use by some Linux package installers. 
Fixes #2202.

This was SVN commit r13986.
 2013-10-11 18:55:46 +00:00
RedFox
8464777759 Fixed premake4 build incorrectly ignoring vs2010 action. 
fixes #2191

This was SVN commit r13972.
 2013-10-07 22:45:08 +00:00
RedFox
a97cd73cf8 Adds EnableSSE2 for Visual Studio builds on windows. 
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191

This was SVN commit r13971.
 2013-10-07 22:39:13 +00:00
RedFox
055ea57468 ref #2191 
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.

This was SVN commit r13970.
 2013-10-07 22:10:16 +00:00
historic_bruno
7901ed51d4 Implements skirmish maps, based on patch by sanderd17, fixes #1198. Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type. 
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631, #889.
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872. Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745.
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.

This was SVN commit r13938.
 2013-10-04 02:29:16 +00:00
Ykkrosh
22f0f2b232 Set _NO_DEBUG_HEAP=1 in VS2010 projects 
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.

Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.

This was SVN commit r13901.
 2013-09-28 14:35:28 +00:00
Yves
12e2428495 Changes the Renderer to expose global functions to scripts instead of using CJSObject. 
Fixes #2137
Refs #1886

This was SVN commit r13877.
 2013-09-21 08:24:45 +00:00
Mythos_Ruler
d6ec0f6dbd Updated installer image. 
This was SVN commit r13800.
 2013-09-06 19:16:33 +00:00
historic_bruno
15586778bb Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078 
This was SVN commit r13779.
 2013-08-27 02:42:56 +00:00
alpha123
96cef624e3 Fix compiling tests on ARM. Patch by Josh. 
This was SVN commit r13646.
 2013-08-12 03:12:57 +00:00
alpha123
93abbae435 Fix build issues on ARM. Patch by Josh. Fixes #2049. 
This was SVN commit r13634.
 2013-08-07 05:00:46 +00:00
historic_bruno
d79ba004da Fixes OS X build failing to find Boost libs, refs #1938 
This was SVN commit r13514.
 2013-06-30 00:48:34 +00:00
historic_bruno
8bccecdb8d Updates Premake Windows binary 
This was SVN commit r13513.
 2013-06-29 23:36:56 +00:00
leper
bbcfa93dc4 Use os.findlib to find boost. Patch by Markus. Fixes #1938. Refs #1518. 
This was SVN commit r13512.
 2013-06-29 22:25:50 +00:00
leper
c01c8fb2fc Stop generating VS2005 project files. Refs #1951. 
This was SVN commit r13479.
 2013-06-14 23:46:12 +00:00
leper
2567fee329 Write mod data correctly. Fixes #1940. 
This was SVN commit r13472.
 2013-06-11 20:50:09 +00:00
leper
b3391ebe39 Fix build warnings. Patch by Markus. Refs #1851. 
This was SVN commit r13469.
 2013-06-11 00:05:57 +00:00
stwf
71b25d5bd4 big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references 
This was SVN commit r13455.
 2013-06-06 11:13:57 +00:00
leper
3758b64916 Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424. 
This was SVN commit r13365.
 2013-04-21 16:47:36 +00:00
Yves
73951b75fc Adds the server-side part of the javascript debugger. Refs #410 
This was SVN commit r13238.
 2013-03-07 13:49:49 +00:00
leper
1e3bdc439b Fix MSVC warning. Refs #1838. 
Remove special support for removed internal mod.

This was SVN commit r13180.
 2013-02-21 19:59:39 +00:00
historic_bruno
7cf7ae769c Suppresses noisy Boost header warnings on OS X by including them as system headers, refs #1076. 
Bumps default SDK in build-osx-bundle.sh to 10.7 (newer Xcode doesn't
include 10.6).
Fixes using xml2-config from SDK when needed.
Fixes more linker warnings about symbol visibility by compiling libs
with fvisibility=hidden.
Updates some comments in the build scripts.

This was SVN commit r13172.
 2013-02-15 22:43:28 +00:00
historic_bruno
b1178d30e3 Adds missing native eol-style property 
This was SVN commit r13151.
 2013-02-04 00:42:53 +00:00
historic_bruno
14f1917a34 NOTE: Requires update-workspaces! 
Adds build script for OS X dependencies, fixes #1112. OS X builds no
longer use MacPorts/Homebrew, check BuildInstructions.
Adds build script for OS X bundles. Adds OS X icon and DMG background
image.
Moves bundled libraries to libraries/source.
Moves most headers and precompiled static libs for Windows to
libraries/win32.
Updates Premake and packaging scripts to support this.

This was SVN commit r13148.
 2013-02-03 23:49:29 +00:00
historic_bruno
5968e3cb63 Adds xcode4 workspace for OS X, from Premake 4.4-beta4 
This was SVN commit r13066.
 2013-01-11 21:31:38 +00:00
historic_bruno
de3a28557c Fixes Boost libs being linked under compiler settings by accident, caused linker errors in Xcode 
This was SVN commit r13065.
 2013-01-11 20:49:33 +00:00
historic_bruno
d65c7751a5 Updates bundled libpng to v1.5.13, built with VC2008 - requires update-workspaces. Refs #864 
This was SVN commit r13035.
 2013-01-03 17:22:14 +00:00
leper
090e2a74cf Sync with upstream. Refs #1518. 
This was SVN commit r12903.
 2012-11-30 21:35:48 +00:00
historic_bruno
5b7564da37 Adds moved mikktspace source files to premake4.lua. 
Mentions mikktspace licensing in LICENSE.txt

This was SVN commit r12796.
 2012-10-30 00:56:24 +00:00
historic_bruno
5cff74f4e7 Replaces FAM file monitoring with inotify on Linux, based on patch by noKid. Fixes #1316, refs #1687. 
Removes FAM dependency.

This was SVN commit r12726.
 2012-10-02 00:03:14 +00:00
historic_bruno
60f9fece29 Fixes build on GNU/kFreeBSD, patch by vincent. Fixes #1322 
This was SVN commit r12702.
 2012-09-24 00:41:35 +00:00
historic_bruno
a3f9da72a5 Removes yucky sed commands from update-workspaces.sh to avoid modifying the Premake makefiles. Adds new BSD and OS X-specific Makefiles instead (can be autogenerated by Premake). Fixes a few bugs and omissions in the Premake4 build configuration script. 
This was SVN commit r12477.
 2012-08-19 18:49:02 +00:00
historic_bruno
011ba8255e New sound system implementation by stwf, refs #1223, #961. 
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
 2012-08-15 00:10:44 +00:00
historic_bruno
2c8adb1aea Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527. Refs #1360 
This was SVN commit r12229.
 2012-07-29 23:04:22 +00:00
historic_bruno
d1b2922f02 Fixes unnecessary linking of X11 on OS X. 
This was SVN commit r12219.
 2012-07-28 23:48:57 +00:00
historic_bruno
9b79ca5179 Fixes incorrect exclusion of rpath that broke shared lib loading. Refs #1421, #1516 
This was SVN commit r12198.
 2012-07-26 13:33:04 +00:00
historic_bruno
2f90e1eee7 Adds --minimal-flags option to Premake, for building only with essential flags (currently only a *nix option). Based on patch by leper. Refs #1516. 
Updates Premake4.make to not include CFLAGS in CXXFLAGS (see
aab1cdf9d6).

This was SVN commit r12173.
 2012-07-22 02:52:37 +00:00
historic_bruno
7726448a7d Adds --without-nvtt option to update-workspaces.sh so we don't attempt to build NVTT in that case, based on patch by pcpa. Refs #1427 
This was SVN commit r12127.
 2012-07-16 04:57:07 +00:00
Ykkrosh
5abedde99a Don't enable -fpch-preprocess (which may interfere with ccache) unless we're actually building with PCH 
This was SVN commit r12069.
 2012-07-04 15:20:42 +00:00
leper
aab1cdf9d6 Don't add system CFLAGS to the CXXFLAGS. Refs #1516. 
This was SVN commit r12025.
 2012-06-26 20:48:06 +00:00
leper
efb6ac808b Fix premake build on OS X by linking with the CoreServices framework. Fixes #1505. 
Remove obsolete and unused parameters. Fixes #1179.

This was SVN commit r11995.
 2012-06-21 22:55:07 +00:00
leper
95a003edb8 Fix premake's os.getversion() to work with glibc. Refs #1322. 
This was SVN commit r11993.
 2012-06-21 22:01:39 +00:00
historic_bruno
5752863e6f Updates premake Windows binary and VS projects for 637c09b204. 
This was SVN commit r11974.
 2012-06-15 23:11:57 +00:00
leper
20e9d70757 Link with boost_system as that is needed for Boost <= 1.43. Refs #1360. 
This was SVN commit r11971.
 2012-06-13 22:54:14 +00:00
leper
637c09b204 Add support for OpenBSD. Fixes #1463. 
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.

This was SVN commit r11970.
 2012-06-13 20:43:56 +00:00
historic_bruno
d97f8180d5 Removes unused Boost link dependencies with patch by fabio. Fixes #1360 
This was SVN commit r11965.
 2012-06-12 05:38:43 +00:00
leper
29a11e24d5 Fix NVTT build on OpenBSD based on patch by anthonyjbentley. Refs #1463. 
This was SVN commit r11962.
 2012-06-10 22:39:26 +00:00
leper
0296323c9d Make FCollada compile on OpenBSD, based on patch by anthonyjbentley. Refs #1463. 
This was SVN commit r11936.
 2012-06-04 21:33:15 +00:00
historic_bruno
37a5bedb81 Adds partial support for Debian GNU/kFreeBSD, based on patch by vincent. Refs #1322. 
This was SVN commit r11781.
 2012-05-07 01:53:35 +00:00
Ykkrosh
770ee1f30c Build test executable with same linker settings as game executable, to fix --without-fam 
This was SVN commit r11661.
 2012-04-24 15:14:14 +00:00
historic_bruno
93c35964da New higher quality icons. Fixes #954. Refs #492. 
This was SVN commit r11613.
 2012-04-21 23:31:31 +00:00
historic_bruno
b101f5ad01 Adds hardware cursors for Linux and OS X. Requires libxcursor on Linux. Fixes #748. 
Adds explicit links to frameworks we need on OS X.

This was SVN commit r11596.
 2012-04-21 07:53:53 +00:00
Ykkrosh
10fd5e57db Fix #916 (complain about spaces in build paths), based on patch from philip_flohr 
This was SVN commit r11380.
 2012-03-20 22:29:56 +00:00
historic_bruno
15cb081163 Removes Makefile PCH support for Obj-C/C++ source files. Apple's latest command line tools encountered an error because the source file was compiled with Obj-C++ but the PCH was compiled with C++. If we really needed PCH for Obj-C++ we could simply compile it separately for each language. Refs #1148. 
This was SVN commit r11259.
 2012-03-06 05:40:11 +00:00
historic_bruno
5f8135edb0 Fixes clang warning about precompiled.h in C++ mode. Fixes #1178. 
This was SVN commit r11258.
 2012-03-06 04:12:21 +00:00
Ykkrosh
b104bec238 Fix Android build scripts. 
This was SVN commit r11153.
 2012-02-25 16:11:08 +00:00
historic_bruno
95e9d72323 Adds install_name to libCollada link options for OS X. 
This was SVN commit r11112.
 2012-02-21 20:27:25 +00:00
historic_bruno
489138ce3d Fixes spurious test of "unix" in Premake (prevented X11 from linking properly) 
This was SVN commit r11109.
 2012-02-20 23:58:59 +00:00
Ykkrosh
56378ea9f1 Experimental Android build support 
This was SVN commit r11078.
 2012-02-15 19:57:49 +00:00
Ykkrosh
ff7653d012 Update Premake for Android 
This was SVN commit r11076.
 2012-02-15 15:53:17 +00:00
Ykkrosh
9972eb8cae Enough GLES compatibility to reach the menu screen 
This was SVN commit r11064.
 2012-02-13 20:53:24 +00:00
historic_bruno
1fe6d4780a Includes Objective-C++ (*.mm) files in Premake generated projects. Premake and GCC handle the rest. Fixes #1148. 
This was SVN commit r11013.
 2012-02-04 01:20:33 +00:00
historic_bruno
41e3bad341 More build fixes for FreeBSD. 
Adds BSD sysdep.
Adds support for MAKE variable, overriding make command in our build
scripts.
Fixes more files not ending with newline.

This was SVN commit r10994.
 2012-01-31 00:06:56 +00:00
historic_bruno
fc27a5c0ea More FreeBSD build fixes. 
Fixes some warnings about files that don't end with newline.

This was SVN commit r10991.
 2012-01-30 06:21:11 +00:00
historic_bruno
19c6ae7b1e Adds incomplete FreeBSD support to Premake scripts. 
Properly detects amd64 system architecture on FreeBSD.
Adds support for WX_CONFIG variable (works just like SDL_CONFIG).
Adds bsd_names for BSD-specific library names.

This was SVN commit r10981.
 2012-01-29 03:58:08 +00:00
Ykkrosh
63e151fbd5 Slightly more Android compatibility 
This was SVN commit r10975.
 2012-01-28 16:38:21 +00:00
Yves
c7e9894d44 Fixes #947 by generating a plain executable instead of an app bundle for development-builds. 
The plan is to create a bundle later as a separate deployment-step after
building.
NVTT build is also changed because the installnames were not correct
when doubleclickig the executable.

This was SVN commit r10946.
 2012-01-22 10:38:08 +00:00
Ykkrosh
182bf2b4af Vague start at hypothetical Android support 
This was SVN commit r10923.
 2012-01-17 22:05:43 +00:00
Ykkrosh
e64a3d3946 Experiment a little with OpenGL ES 
This was SVN commit r10915.
 2012-01-15 23:15:31 +00:00
Ykkrosh
e4b2de4bba Delete obsolete AoE3Ed code 
This was SVN commit r10909.
 2012-01-14 19:12:18 +00:00
Ykkrosh
c349fb0b3c Make Premake makefile compatible with OS X 
This was SVN commit r10898.
 2012-01-12 00:03:37 +00:00
Ykkrosh
d07eac218c SDL 1.3 build fixes. 
Support SDL_CONFIG environment variable in update-workspaces to pick
non-default sdl-config.
Avoid non-standard use of SDL/ in include paths.

This was SVN commit r10895.
 2012-01-11 22:50:39 +00:00
Ykkrosh
11737926a1 Remove Premake's (seemingly undocumented) usage of the ARCH environment variable, which is usually unset but causes build failures in some build environments that set it. 
Remake Premake's Makefiles with current patched version of Premake.

This was SVN commit r10894.
 2012-01-11 17:43:07 +00:00
Ykkrosh
0ec4242962 Detect and fix printf signedness errors. Fixes #1086, #1087. 
This was SVN commit r10846.
 2012-01-01 16:43:10 +00:00
Yves
9911f561d3 Closes #1050 (Codeblocks not relinking after static libraries change) 
This was SVN commit r10814.
 2011-12-25 21:25:04 +00:00
Yves
4a42b6bf28 Solves/Works around some linking problems for ActorEditor, ArchiveViewer and FileConverter. Closes #1004 
This was SVN commit r10749.
 2011-12-17 12:59:29 +00:00
Ykkrosh
5bd7b74ec7 Fix ABI incompatibility with --with-system-mozjs185 in debug mode (see #990). 
This was SVN commit r10535.
 2011-11-14 18:18:04 +00:00
Ykkrosh
ed5a64aae4 Add --with-system-mozjs185 build flag. Fixes #990, based on patch by infyquest. 
This was SVN commit r10534.
 2011-11-14 16:10:41 +00:00
Ykkrosh
fbff0aa98d Fix printf argument types 
This was SVN commit r10529.
 2011-11-13 18:31:06 +00:00
Yves
fc9e89647b Adds basic support for Code::Blocks on the Mac and Linux. 
The Project structure is still a bit strange, but it builds successfully
now.

This was SVN commit r10521.
 2011-11-12 23:58:35 +00:00
Ykkrosh
9cbf587e59 Import Mongoose HTTP server library 
This was SVN commit r10463.
 2011-11-03 23:36:54 +00:00
fcxSanya
b0ad0d97be Remove Premake3 files. Closes #934. 
This was SVN commit r10362.
 2011-10-03 19:09:03 +00:00
historic_bruno
6ff59cbeeb Enables Atlas build on OS X. 
This was SVN commit r10300.
 2011-09-20 22:52:21 +00:00
historic_bruno
1389f11b6e Applies Yves' latest patch for premake4. 
Fixes test generation path in XCode and MSVC.
Fixes PCH dependency tracking in GCC. Fixes #903.
Fixes PCH being included in its own input (caused GCC bus error).
Ensures premake4 gets rebuilt on *nix after running clean-workspaces.sh.
Updates Windows premake4 binary.

This was SVN commit r10154.
 2011-09-01 01:58:04 +00:00
historic_bruno
37dad6eb62 This was SVN commit r10084. 2011-08-24 02:54:31 +00:00
historic_bruno
f9dc6d9d69 Removes superfluous test build configuration from premake4. 
This was SVN commit r10082.
 2011-08-24 00:15:00 +00:00
Ykkrosh
8872bad668 AoEO BAR compatibility in AoE3Ed 
This was SVN commit r10026.
 2011-08-17 16:17:22 +00:00
historic_bruno
fab7bf4fcf Fixes manifest dependencies for Actor Editor. Fixes #924. 
This was SVN commit r10018.
 2011-08-16 22:08:47 +00:00
historic_bruno
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
historic_bruno
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
Ykkrosh
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
Ykkrosh
9edfe0fbcd Fix clean-workspaces script for new SpiderMonkey 
This was SVN commit r9876.
 2011-07-18 17:32:07 +00:00
Ykkrosh
2f0bd8d8b0 Upgrade to SpiderMonkey 1.8.5 (fixes #734) 
This was SVN commit r9852.
 2011-07-16 23:24:14 +00:00
Ykkrosh
c7ba150c40 Fix handling of update-workspaces arguments on Windows 
This was SVN commit r9849.
 2011-07-16 22:17:47 +00:00
Ykkrosh
0aba4006cc Fix object path for .asm files in VC200x 
This was SVN commit r9837.
 2011-07-15 22:48:37 +00:00
Ykkrosh
e8e4d37c8d Set up manifest via linkoptions for test executable 
This was SVN commit r9836.
 2011-07-15 22:45:50 +00:00
Ykkrosh
b551a744cc Premake4 binary for Windows 
This was SVN commit r9833.
 2011-07-15 19:01:50 +00:00
Ykkrosh
1e470d37ff Pre-generated Premake4 build files 
This was SVN commit r9832.
 2011-07-15 18:55:36 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
fcab9e3b5e Import Premake4 source (rev fc0374a03b17), minus samples/ and packages/ 
This was SVN commit r9828.
 2011-07-15 17:32:06 +00:00
Ykkrosh
e9b3bcf467 Disable building Atlas by default on OS X 
This was SVN commit r9766.
 2011-07-06 20:14:25 +00:00
historic_bruno
0c803f99e8 This was SVN commit r9609. 2011-06-09 23:47:20 +00:00
Ykkrosh
266977bc78 Attempt to fix manifest problems in autobuild. 
This was SVN commit r9607.
 2011-06-09 23:16:27 +00:00
Ykkrosh
c2677b4bb0 Upgrade game and build system to ENet 1.3 
This was SVN commit r9574.
 2011-05-29 20:57:28 +00:00
Ykkrosh
acb48663d7 Windows fixes 
This was SVN commit r9570.
 2011-05-29 18:14:52 +00:00
Ykkrosh
a81f180dd6 Remove Atlas UI scripting support 
This was SVN commit r9567.
 2011-05-29 15:43:08 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
1075e206f7 Fix some format string errors 
This was SVN commit r9534.
 2011-05-18 19:10:36 +00:00
Ykkrosh
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
janwas
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
historic_bruno
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
1c3c962ea1 Import libcurl for Windows 
This was SVN commit r8924.
 2011-02-16 11:22:34 +00:00
Ykkrosh
0d8ffa58dc AoE3Ed build fixes 
This was SVN commit r8868.
 2011-01-17 13:29:45 +00:00
janwas
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
Ykkrosh
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
Ykkrosh
94dca529b1 Fix OS X build errors 
This was SVN commit r8684.
 2010-11-23 19:20:03 +00:00
Ykkrosh
b13e6ae293 Fix script to rebuild SpiderMonkey properly 
This was SVN commit r8633.
 2010-11-17 00:58:10 +00:00
Ykkrosh
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
Ykkrosh
83285504cb Disable RTTI in test project, for consistency 
This was SVN commit r8565.
 2010-11-10 15:26:29 +00:00
janwas
6935a03743 remove no-longer needed GLU dependency; avoids delay-load warning. 
This was SVN commit r8555.
 2010-11-08 10:42:34 +00:00
Ykkrosh
818ea52c3b Delete obsolete non-working i18n code 
This was SVN commit r8527.
 2010-11-03 17:52:07 +00:00
Ykkrosh
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
Ykkrosh
dd3bf54e4c Add translation to desktop file (see #492) 
This was SVN commit r8310.
 2010-10-08 14:08:54 +00:00
Ykkrosh
7b6775ee9f Fix building with NVTT 
This was SVN commit r8309.
 2010-10-08 10:42:23 +00:00
Ykkrosh
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
Ykkrosh
aadbf53a2a Add nvtt to build system 
This was SVN commit r8093.
 2010-09-10 20:15:49 +00:00
Ykkrosh
d922034a8e Replace Windows installer bitmap 
This was SVN commit r7969.
 2010-08-15 14:56:01 +00:00
Ykkrosh
6707e6cf6b Use non-debug executable for Linux packages. 
This was SVN commit r7968.
 2010-08-15 12:23:11 +00:00
Ykkrosh
025b7960f8 Suggest more Debian-compatible install paths 
This was SVN commit r7945.
 2010-08-14 19:39:50 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
29d3f824e0 Remove obsolete CppDoc files 
This was SVN commit r7819.
 2010-07-29 20:43:24 +00:00
Ykkrosh
797e2bb491 NSIS-based installer for Windows. Fixes #519. 
This was SVN commit r7812.
 2010-07-26 23:38:46 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
bad3d04bc0 Fix some Premake warnings 
This was SVN commit r7755.
 2010-07-14 13:53:26 +00:00
Ykkrosh
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
Ykkrosh
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
janwas
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
47ca9fc6cb Autobuild fixes (untested) 
This was SVN commit r7597.
 2010-05-30 15:18:24 +00:00
Ykkrosh
5b9d29729a Windows fixes 
This was SVN commit r7592.
 2010-05-27 23:51:14 +00:00
Ykkrosh
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
Ykkrosh
80229cdea7 Remove unused DCDT library 
This was SVN commit r7556.
 2010-05-20 18:32:03 +00:00
Ykkrosh
56bb858802 # Delete a lot of obsolete simulation code. 
This was SVN commit r7555.
 2010-05-20 18:09:23 +00:00
Ykkrosh
202b13d557 Fix the calling conventions properly this time (I hope) 
This was SVN commit r7542.
 2010-05-13 16:22:07 +00:00
Ykkrosh
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
Ykkrosh
3c75dba1b8 Clean up some svn:executable flags 
This was SVN commit r7518.
 2010-05-08 23:17:08 +00:00
Ykkrosh
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
Ykkrosh
0429c113ab Tell nasm to use macho64 when appropriate 
This was SVN commit r7475.
 2010-04-21 20:56:32 +00:00
Ykkrosh
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
janwas
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
Ykkrosh
7abb71f265 Use optimised FCollada on Unix non-debug builds. Fixes #207. 
This was SVN commit r7429.
 2010-04-03 11:27:24 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
a902b7a2f4 Remove obsolete undocumented line-fixing tool 
This was SVN commit r7394.
 2010-03-24 20:01:39 +00:00
Ykkrosh
0670638198 Remove obsolete build instructions (see BuildInstructions page instead) 
This was SVN commit r7393.
 2010-03-24 19:54:01 +00:00
Ykkrosh
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
Ykkrosh
5118d6ab32 Restrict rpath usage to Linux 
This was SVN commit r7386.
 2010-03-21 18:40:22 +00:00
Ykkrosh
55adcfc595 Use better rpath for finding libraries on Linux 
This was SVN commit r7376.
 2010-03-20 18:45:55 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
e7e8b8dbc3 Fix spidermonkey-tip to build on Windows. Add precompiled binaries. 
This was SVN commit r7365.
 2010-03-19 20:28:22 +00:00
Ykkrosh
99fc76e7dd Update spidermonkey-tip to recent version 
This was SVN commit r7363.
 2010-03-19 19:26:41 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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