1
1
forked from 0ad/0ad
Commit Graph

432 Commits

Author SHA1 Message Date
1b3261b8f4 Added third-party libraries for internationalization and localization: ICU and tinygettext
This was SVN commit r14951.
2014-04-20 19:17:32 +00:00
e9e05f4efc Second (main) commit for the SpiderMonkey upgrade.
This commit contains all the required changes to our source files and
build scripts (hopefully).
A next commit will remove the old stuff of SpiderMonkey 1.8.5.

Spcial thanks to:
 - H4writer who helped a lot mainly with the performance issues we
had/have, but also with other problems or questions.
 - Leper for the review.
 - Historic_bruno for implementing the build scripts on Mac OS X and
testing on the Mac.
 - The people from the #jsapi channel and from
mozilla.dev.tech.js-engine who answered a lot of questions and helped
solving problems.
 - All the other people who helped

Refs #1886
Fixes #2442
Fixes #2416

This was SVN commit r14877.
2014-03-28 20:26:32 +00:00
c8bdd993c0 Upgrades cxxtest.
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b60 and 4a57fed5a7 to the updated
sources.
Replaces the cxxtestgen.exe for Windows. This file was created from
cxxtest's python script using pywin32.
Modifies update-workspace.sh to force a rebuild when cxxtest options
could have been changed during the premake step.
Adds an additional option (--jenkins-tests) to
premake4.lua/update-workspaces.sh to use cxxtest's XmlPrinter which
generates output than can be used by Jenkins.

Fixes #2450

This was SVN commit r14818.
2014-03-07 20:58:17 +00:00
17f8f09399 Removes the ScriptInterface and SpiderMonkey dependencies from Atlas.
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.

Fixes #2434
Refs #1886

This was SVN commit r14783.
2014-02-24 20:22:02 +00:00
581c7635e1 Makes our favourite example of escaping even more awesome.
Codeblocks 12.11 requires an additional $ sign. This will break 10.05
and I haven't tested it with 13.12 or on other systems than Ubuntu.

This was SVN commit r14748.
2014-02-13 15:21:14 +00:00
82ab190c5d Do what my previous commit was supposed to do.
This was SVN commit r14598.
2014-01-18 00:37:00 +00:00
9ad01e52fb Add third_party/encryption in premake as required for the lobby.
This was SVN commit r14597.
2014-01-17 23:51:23 +00:00
11430cf927 Remove scripting directory from premake4.lua
(I forgot that in cbc0650a79)

This was SVN commit r14562.
2014-01-10 19:52:57 +00:00
4b1297b328 Removes g_ScriptingHost and implements global to compartment 1 to 1 relation.
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.

Closes #2241
Refs #1886
Refs #1966

This was SVN commit r14496.
2014-01-04 10:14:53 +00:00
42bc5165ab Add compile time flag to disable use of miniupnpc.
This was SVN commit r14384.
2013-12-18 16:08:56 +00:00
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
99f44ff7a0 Reorganizes extern libs in alphabetical order
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
8dab478691 Bundle miniUPnPc with 0AD.
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
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
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
294aa142d8 Fixes compiling with the flag "--without-lobby".
Refs #2267

This was SVN commit r14203.
2013-11-17 11:52:11 +00:00
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
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
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
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
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
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
81cf02cc13 Fix building with --without-lobby. Fixes #2249.
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
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
1138419017 Remove broken build script
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
8d5d66e57b Fix error that slipped into the lobby commit.
This was SVN commit r14099.
2013-11-07 20:10:59 +00:00
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
d7121f4f55 glooxwrapper by Philip to support building gloox on Windows.
This was SVN commit r14097.
2013-11-07 19:38:09 +00:00
10e23c173d Add gloox library files.
This was SVN commit r14096.
2013-11-07 19:04:30 +00:00
3298dce158 Remove the unused crypto++ library.
This was SVN commit r14093.
2013-11-07 18:49:43 +00:00
29e4b1a17c Update Android support
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
e2f475b86a Make the *nix ARM support a little sturdier, Fixes #2121
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
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
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
8464777759 Fixed premake4 build incorrectly ignoring vs2010 action.
fixes #2191

This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
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
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
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
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
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
d6ec0f6dbd Updated installer image.
This was SVN commit r13800.
2013-09-06 19:16:33 +00:00
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
96cef624e3 Fix compiling tests on ARM. Patch by Josh.
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
93abbae435 Fix build issues on ARM. Patch by Josh. Fixes #2049.
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
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
8bccecdb8d Updates Premake Windows binary
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
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
c01c8fb2fc Stop generating VS2005 project files. Refs #1951.
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
2567fee329 Write mod data correctly. Fixes #1940.
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
b3391ebe39 Fix build warnings. Patch by Markus. Refs #1851.
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00