1
0
forked from 0ad/0ad
Commit Graph

143 Commits

Author SHA1 Message Date
a86231240d Fixes some bugs in OS X bundle build script.
Logs most build output to file using simple redirects for now.
Hides output of pushd/popd commands

This was SVN commit r15828.
2014-09-29 04:33:51 +00:00
2afeec0c01 Unify removal of incomplete translations in packaging scripts. Fixes #2825.
This was SVN commit r15826.
2014-09-28 21:51:48 +00:00
8f039bfb44 Fixes translation inclusion regex for build-osx-bundle.sh, fixes #2764
This was SVN commit r15808.
2014-09-26 01:06:21 +00:00
b155d4f7e3 Updates OS X bundle build script. Adds --release flag which can be used to build a proper release bundle, including SVN export, at the expense of time and disk space. Moves SVN-specific logic to this mode, otherwise the script works with git or no source control at all.
Removes obsolete instructions for building a 32-bit 10.5 bundle.

This was SVN commit r15801.
2014-09-25 02:18:19 +00:00
5ad07045e2 Sets OS X build to use SDL2 by default, refs #2041
This was SVN commit r15799.
2014-09-25 01:54:58 +00:00
3f75e5db0e Adds --sdl2 flag to update-workspaces.bat, making SDL2 the default on Windows, refs #2041
This was SVN commit r15786.
2014-09-22 19:42:55 +00:00
8f61e36352 Adds SDL2 to build-osx-libs.sh, but leave SDL1 as the default while we test, refs #2041.
Note: SDL2_CONFIG is now the variable to override the path to
sdl2-config, SDL_CONFIG remains to override the path to sdl-config

This was SVN commit r15774.
2014-09-20 19:02:24 +00:00
6bec648833 Removes bundled ENet source. NOTE: system libenet (1.3) is now required on *nix, see BuildInstructions for updates. This change requires running update-workspaces. Fixes #1568.
Updates update-workspaces.sh and build-osx-libs.sh for this change.
Updates precompiled win32 ENet to 1.3.12, built with VC++ 2010, and
moves it to libraries/win32, refs #864.

This was SVN commit r15457.
2014-06-28 05:48:51 +00:00
fd6b199606 Fix compiling on Mavericks. Users on older systems will need to change a few lines in either of those scripts, but it should not break their build. For now, I'm saying it Fixes #2304 .
This was SVN commit r15447.
2014-06-25 18:01:00 +00:00
0e6f6576dc Fix compilation on Mavericks when running build-osx-bundle.sh.
Fixes to build-osx-libs.sh.
Support gloox properly on OSX.
Refs #2304 (not fixed since afaik xCode still runs into some issues)

This was SVN commit r15410.
2014-06-22 08:27:58 +00:00
8817bd394b Fix the check if the script is beeing exectued as root for sh (== comparision seems to work for bash but not for sh).
This was SVN commit r15396.
2014-06-19 15:19:08 +00:00
519c00c1a6 Don't allow users to build workspaces as root user
This was SVN commit r15369.
2014-06-15 15:23:03 +00:00
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
8dab478691 Bundle miniUPnPc with 0AD.
This was SVN commit r14333.
2013-12-13 02:59:35 +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
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
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
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
d7121f4f55 glooxwrapper by Philip to support building gloox on Windows.
This was SVN commit r14097.
2013-11-07 19:38:09 +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
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
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
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
b1178d30e3 Adds missing native eol-style property
This was SVN commit r13151.
2013-02-04 00:42:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
b0ad0d97be Remove Premake3 files. Closes #934.
This was SVN commit r10362.
2011-10-03 19:09:03 +00:00
6ff59cbeeb Enables Atlas build on OS X.
This was SVN commit r10300.
2011-09-20 22:52:21 +00:00
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
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
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
e9b3bcf467 Disable building Atlas by default on OS X
This was SVN commit r9766.
2011-07-06 20:14:25 +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
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
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
aadbf53a2a Add nvtt to build system
This was SVN commit r8093.
2010-09-10 20:15:49 +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
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
0670638198 Remove obsolete build instructions (see BuildInstructions page instead)
This was SVN commit r7393.
2010-03-24 19:54:01 +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
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
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
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
95ca9604f1 Check that premake is up-to-date before updating workspaces
This was SVN commit r6955.
2009-07-13 16:59:10 +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
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
6b51050f96 Updated Premake to generate VS2008 project files.
This was SVN commit r6127.
2008-06-28 00:49:38 +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
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
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
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
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
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
58aaff1ff2 explain how/where to build premake
This was SVN commit r4987.
2007-04-23 08:34:16 +00:00
2d4f5478de Added ICC-Linux PCH support in Premake. (It's much more like the MSVC approach than the GCC one.)
Passed --have-std to CxxTest so it always adds the same code before
including precompiled.h, so that the PCH is usable.

This was SVN commit r4736.
2007-01-04 03:22:23 +00:00
4d8133f785 # Fixes for MSVC
Use _WIN32/__WXMSW__ instead of OS_WIN.

This was SVN commit r4668.
2006-12-01 20:34:28 +00:00
35ac7776ee GCC PCH support: closes #155, and decreases build times by a BUNCH!
Changed the default to generating PCH's for all platforms and added a
premake
command line option --without-pch, in case it breaks somewhere (but
AFAIK, Mac's
use recent enough versions of GCC, so it should be fine).

# Added support for precompiled headers into the Linux build system.
Build times are now significantly reduced (up to 50%!)

This was SVN commit r4642.
2006-11-12 19:46:47 +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
52077dfec5 no longer create vc2002 project
This was SVN commit r3994.
2006-06-09 20:01:25 +00:00
3fbc464857 # Updated build system
to use Premake 3.1 (slightly modified - see next commit), and to
properly support VS2005. Should still be compatible with GCC, though
there may be differences I haven't noticed.
Removed option to build ScEd (because it won't work anyway).

This was SVN commit r3782.
2006-04-20 01:20:24 +00:00
f2b662d12d Build: generate Atlas project files (with "update-workspaces --atlas") (for VS2003 only).
Premake: allow slight separation of files' locations on disk vs in the
project tree.
Atlas: require fewer include directories.

This was SVN commit r2956.
2005-10-17 01:11:12 +00:00
41068dc97d Add a note that Icecream is supported for distributed builds.
This was SVN commit r2799.
2005-09-28 23:07:09 +00:00
414015ca57 Deleted redundant required-libraries.txt
This was SVN commit r1918.
2005-02-09 23:36:05 +00:00
f4fe8c8543 Sky colour, plus skycolor config value
This was SVN commit r1583.
2004-12-28 11:16:05 +00:00
05c4ec0365 Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
2f809325d9 Removed deprecated FMOD section in library readme
This was SVN commit r1492.
2004-12-12 23:49:18 +00:00
2e0bb04882 Linux fixes for new workspace layout
This was SVN commit r1486.
2004-12-11 21:50:03 +00:00
cf7f9dcc47 Made premake put ps_test.pdb into binaries/data
This was SVN commit r1458.
2004-12-05 19:10:57 +00:00
ec3452679c Restructuring
This was SVN commit r1453.
2004-12-05 17:59:29 +00:00