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
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
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
090e2a74cf
Sync with upstream. Refs #1518 .
...
This was SVN commit r12903.
2012-11-30 21:35:48 +00:00
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
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
60f9fece29
Fixes build on GNU/kFreeBSD, patch by vincent. Fixes #1322
...
This was SVN commit r12702.
2012-09-24 00:41:35 +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
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
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
d1b2922f02
Fixes unnecessary linking of X11 on OS X.
...
This was SVN commit r12219.
2012-07-28 23:48:57 +00:00
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
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
2012-07-22 02:52:37 +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
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
aab1cdf9d6
Don't add system CFLAGS to the CXXFLAGS. Refs #1516 .
...
This was SVN commit r12025.
2012-06-26 20:48:06 +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
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
5752863e6f
Updates premake Windows binary and VS projects for 637c09b204.
...
This was SVN commit r11974.
2012-06-15 23:11:57 +00:00
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
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
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
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
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
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
93c35964da
New higher quality icons. Fixes #954 . Refs #492 .
...
This was SVN commit r11613.
2012-04-21 23:31:31 +00:00
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
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
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
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
b104bec238
Fix Android build scripts.
...
This was SVN commit r11153.
2012-02-25 16:11:08 +00:00
95e9d72323
Adds install_name to libCollada link options for OS X.
...
This was SVN commit r11112.
2012-02-21 20:27:25 +00:00
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
56378ea9f1
Experimental Android build support
...
This was SVN commit r11078.
2012-02-15 19:57:49 +00:00
ff7653d012
Update Premake for Android
...
This was SVN commit r11076.
2012-02-15 15:53:17 +00:00
9972eb8cae
Enough GLES compatibility to reach the menu screen
...
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
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
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
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
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
63e151fbd5
Slightly more Android compatibility
...
This was SVN commit r10975.
2012-01-28 16:38:21 +00:00
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
182bf2b4af
Vague start at hypothetical Android support
...
This was SVN commit r10923.
2012-01-17 22:05:43 +00:00
e64a3d3946
Experiment a little with OpenGL ES
...
This was SVN commit r10915.
2012-01-15 23:15:31 +00:00
e4b2de4bba
Delete obsolete AoE3Ed code
...
This was SVN commit r10909.
2012-01-14 19:12:18 +00:00
c349fb0b3c
Make Premake makefile compatible with OS X
...
This was SVN commit r10898.
2012-01-12 00:03:37 +00:00
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
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
0ec4242962
Detect and fix printf signedness errors. Fixes #1086 , #1087 .
...
This was SVN commit r10846.
2012-01-01 16:43:10 +00:00
9911f561d3
Closes #1050 (Codeblocks not relinking after static libraries change)
...
This was SVN commit r10814.
2011-12-25 21:25:04 +00:00
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
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
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
fbff0aa98d
Fix printf argument types
...
This was SVN commit r10529.
2011-11-13 18:31:06 +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
9cbf587e59
Import Mongoose HTTP server library
...
This was SVN commit r10463.
2011-11-03 23:36:54 +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
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
