(svn r7759) -Merge: makefile rewrite. This merge features:
- 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.
This commit is contained in:
30
src/os/macosx/macos.h
Normal file
30
src/os/macosx/macos.h
Normal file
@@ -0,0 +1,30 @@
|
||||
/* $Id$ */
|
||||
|
||||
#ifndef MACOS_H
|
||||
#define MACOS_H
|
||||
|
||||
/*
|
||||
* Functions to show the popup window
|
||||
* use ShowMacDialog when you want to control title, message and text on the button
|
||||
* ShowMacAssertDialog is used by assert
|
||||
* ShowMacErrorDialog should be used when an unrecoverable error shows up. It only contains the title, which will should tell what went wrong
|
||||
* the function then adds text that tells the user to update and then report the bug if it's present in the newest version
|
||||
* It also quits in a nice way since we call it when we know something happened that will crash OpenTTD (like a needed pointer turns out to be NULL or similar)
|
||||
*/
|
||||
void ShowMacDialog ( const char *title, const char *message, const char *buttonLabel );
|
||||
void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression );
|
||||
void ShowMacErrorDialog(const char *error);
|
||||
|
||||
// Since MacOS X users will never see an assert unless they started the game from a terminal
|
||||
// we're using a custom assert(e) macro.
|
||||
#undef assert
|
||||
|
||||
#ifdef NDEBUG
|
||||
#define assert(e) ((void)0)
|
||||
#else
|
||||
|
||||
#define assert(e) \
|
||||
(__builtin_expect(!(e), 0) ? ShowMacAssertDialog ( __func__, __FILE__, __LINE__, #e ): (void)0 )
|
||||
#endif
|
||||
|
||||
#endif /* MACOS_H */
|
Reference in New Issue
Block a user