| Age | Commit message (Collapse) | Author |
|---|
|
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
|
|
openttd.cfg instead of the full path to the font.
|
|
Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
|
|
it's not needed any longer
|
|
LIBPNG_CONFIG
|
|
that it's used after all
|
|
anymore
This should hopefully fix the issue where WITH_SDL can be defined while SDL-CONFIG is not
Added an error if WITH_SDL is defined but SDL-CONFIG is not. The same goes for WITH_PNG even though nobody reported this as a problem
removed STATIC_ZLIB_PATH as it turns out that nobody used it
|
|
calling itself. NOTE: Delete Makefile.config to recover.
|
|
present in the system
if detected, WITH_ICONV will be defined in the C code
WITH_ICONV is also added to Makefile.config
OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version
the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv
This detection system is by request of Darkvater
|
|
while those 2 conflict
|
|
wrapper-configure
|
|
with the default ones when MAKEFILE_VERSION was changed
|
|
you can still use SDL drivers if you like and you have to run "make upgradeconf" to start using the cocoa drivers (or manually write WITH_COCOA:=1)
since SDL breaks the cocoa drivers, you can't compile with both SDL and cocoa support
Using cocoa drivers makes it easier to make universal binaries and it solves:
-FS#18 [OSX] SDL is weird in universal binaries
-FS#2 [OSX] lazy pointer crash on exit
-FS#10 [OSX] linking error when linking statically to SDL 1.2.8 (needless to explain this, but it means it should be able to compile statically with the default settings now)
-[ 1215073 ] Switching to large size out of fullscreen crashes
Using SDL drivers will still have those issues though
|
|
dynamic libs and can move libs into the bundle
This is not a fix for the issues with static linking, more like a workaround. Static linking still got issues
Apple recommends to use dynamic linking anyway, so I guess this doesn't matter much
|
|
|
|
else in Makefile.config
useful if you for some reason got a libpng-config, which is called something else
|
|
|
|
Mac: sets the STATIC flag if no makefile.config is found
|
|
|
|
Makefile.config is found
Cygwin: workaround: libpng is automatically not used even if present until the Cygwin/libpng problem is solved
|
|
were missing in the autodetected makefile.config
|
|
|
|
work
|
|
|
