BUILD: Rename UNIX #define to POSIX

This commit is contained in:
Max Horn 2011-05-05 15:38:54 +02:00
parent 6639eacb3a
commit 39076ef972
18 changed files with 991 additions and 1592 deletions

View File

@ -18,6 +18,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
#include "backends/base-backend.h"
@ -57,11 +60,15 @@ void BaseBackend::fillScreen(uint32 col) {
*/
#if defined(UNIX)
#if defined(POSIX)
#if defined(SAMSUNGTV)
#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
#else
#define DEFAULT_CONFIG_FILE ".scummvmrc"
#endif
#endif
#if !defined(UNIX)
#if !defined(POSIX)
#define DEFAULT_CONFIG_FILE "scummvm.ini"
#endif

View File

@ -279,7 +279,7 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
event.type = Common::EVENT_QUIT;
return true;
}
#elif defined(UNIX)
#elif defined(POSIX)
// On other *nix systems, Control-Q quits
if ((ev.key.keysym.mod & KMOD_CTRL) && ev.key.keysym.sym == 'q') {
event.type = Common::EVENT_QUIT;
@ -323,7 +323,7 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
if (ev.key.keysym.sym == 'm' || // Ctrl-m toggles mouse capture
#if defined(MACOSX)
// Meta - Q, handled below
#elif defined(UNIX)
#elif defined(POSIX)
ev.key.keysym.sym == 'q' || // On other *nix systems, Control-Q quits
#else
ev.key.keysym.sym == 'z' || // Ctrl-z quit
@ -336,7 +336,7 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
#if defined(MACOSX)
if ((mod & KMOD_META) && ev.key.keysym.sym == 'q')
return false; // On Macintosh, Cmd-Q quits
#elif defined(UNIX)
#elif defined(POSIX)
// Control Q has already been handled above
#else
if ((mod & KMOD_ALT) && ev.key.keysym.sym == 'x')

View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#if defined(UNIX)
#if defined(POSIX)
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
// Also with clock() in sys/time.h in some Mac OS X SDKs.

View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#if defined(UNIX)
#if defined(POSIX)
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
// Also with clock() in sys/time.h in some Mac OS X SDKs.
@ -249,4 +249,4 @@ Common::WriteStream *POSIXFilesystemNode::createWriteStream() {
return StdioStream::makeFromPath(getPath(), true);
}
#endif //#if defined(UNIX)
#endif //#if defined(POSIX)

View File

@ -55,7 +55,7 @@ MODULE_OBJS += \
plugins/sdl/sdl-provider.o \
timer/sdl/sdl-timer.o
ifdef UNIX
ifdef POSIX
MODULE_OBJS += \
fs/posix/posix-fs.o \
fs/posix/posix-fs-factory.o \

View File

@ -34,7 +34,7 @@
*/
#if defined(__amigaos4__)
#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
#elif defined(UNIX)
#elif defined(POSIX)
#include "backends/fs/posix/posix-fs-factory.h"
#elif defined(WIN32)
#include "backends/fs/windows/windows-fs-factory.h"
@ -60,7 +60,7 @@ public:
OSystem_NULL::OSystem_NULL() {
#if defined(__amigaos4__)
_fsFactory = new AmigaOSFilesystemFactory();
#elif defined(UNIX)
#elif defined(POSIX)
_fsFactory = new POSIXFilesystemFactory();
#elif defined(WIN32)
_fsFactory = new WindowsFilesystemFactory();

View File

@ -24,7 +24,7 @@
// Several SDL based ports use a custom main, and hence do not want to compile
// of this file. The following "#if" ensures that.
#if !defined(UNIX) && \
#if !defined(POSIX) && \
!defined(WIN32) && \
!defined(__MAEMO__) && \
!defined(__SYMBIAN32__) && \

View File

@ -5,7 +5,7 @@ MODULE_OBJS := \
main.o \
sdl.o
ifdef UNIX
ifdef POSIX
MODULE_OBJS += \
posix/posix-main.o \
posix/posix.o

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#if defined(UNIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA)
#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA)
#include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h"

View File

@ -26,7 +26,7 @@
#include "common/scummsys.h"
#ifdef UNIX
#ifdef POSIX
#include "backends/platform/sdl/posix/posix.h"
#include "backends/saves/posix/posix-saves.h"
@ -61,7 +61,7 @@ void OSystem_POSIX::initBackend() {
Common::String OSystem_POSIX::getDefaultConfigFileName() {
char configFile[MAXPATHLEN];
// On UNIX type systems, by default we store the config file inside
// On POSIX type systems, by default we store the config file inside
// to the HOME directory of the user.
const char *home = getenv("HOME");
if (home != NULL && strlen(home) < MAXPATHLEN)

View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#if defined(DYNAMIC_MODULES) && defined(UNIX)
#if defined(DYNAMIC_MODULES) && defined(POSIX)
#include "backends/plugins/posix/posix-provider.h"
#include "backends/plugins/dynamic-plugin.h"
@ -77,9 +77,9 @@ public:
};
Plugin* POSIXPluginProvider::createPlugin(const Common::FSNode &node) const {
Plugin *POSIXPluginProvider::createPlugin(const Common::FSNode &node) const {
return new POSIXPlugin(node.getPath());
}
#endif // defined(DYNAMIC_MODULES) && defined(UNIX)
#endif // defined(DYNAMIC_MODULES) && defined(POSIX)

View File

@ -25,13 +25,13 @@
#include "base/plugins.h"
#if defined(DYNAMIC_MODULES) && defined(UNIX)
#if defined(DYNAMIC_MODULES) && defined(POSIX)
class POSIXPluginProvider : public FilePluginProvider {
protected:
Plugin* createPlugin(const Common::FSNode &node) const;
Plugin *createPlugin(const Common::FSNode &node) const;
};
#endif // defined(DYNAMIC_MODULES) && defined(UNIX)
#endif // defined(DYNAMIC_MODULES) && defined(POSIX)
#endif

View File

@ -28,7 +28,7 @@
#include "common/scummsys.h"
#if defined(UNIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
#if defined(POSIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
#include "backends/saves/posix/posix-saves.h"
@ -83,13 +83,7 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
}
#endif
}
/*
POSIXSaveFileManager::POSIXSaveFileManager(const Common::String &defaultSavepath)
: DefaultSaveFileManager(defaultSavepath) {
}
*/
#if defined(UNIX)
void POSIXSaveFileManager::checkPath(const Common::FSNode &dir) {
const Common::String path = dir.getPath();
clearError();
@ -154,6 +148,5 @@ void POSIXSaveFileManager::checkPath(const Common::FSNode &dir) {
}
}
}
#endif
#endif

View File

@ -25,7 +25,7 @@
#include "backends/saves/default/default-saves.h"
#if defined(UNIX)
#if defined(POSIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
/**
* Customization of the DefaultSaveFileManager for POSIX platforms.
* The only two differences are that the default constructor sets
@ -35,7 +35,6 @@
class POSIXSaveFileManager : public DefaultSaveFileManager {
public:
POSIXSaveFileManager();
// POSIXSaveFileManager(const Common::String &defaultSavepath);
protected:
/**

View File

@ -142,7 +142,7 @@ public:
/**
* Request a list of available savegames with a given DOS-style pattern,
* also known as "glob" in the UNIX world. Refer to the Common::matchString()
* also known as "glob" in the POSIX world. Refer to the Common::matchString()
* function to learn about the precise pattern format.
* @param pattern Pattern to match. Wildcards like * or ? are available.
* @return list of strings for all present file names.

72
configure vendored
View File

@ -147,7 +147,7 @@ _build_scalers=yes
_build_hq_scalers=yes
_indeo3=auto
_enable_prof=no
_unix=no
_posix=no
_global_constructors=no
_elf_loader=no
# Default vkeybd/keymapper options
@ -1548,7 +1548,7 @@ case $_host_os in
LDFLAGS="$LDFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
LDFLAGS="$LDFLAGS -mthumb-interwork"
add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
_unix=yes
_posix=yes
_seq_midi=no
;;
beos*)
@ -1558,11 +1558,11 @@ case $_host_os in
CFLAGS="-I/boot/home/config/include"
CXXFLAGS="$CXXFLAGS -fhuge-objects"
LIBS="$LIBS -lbind -lsocket"
_unix=yes
_posix=yes
_seq_midi=no
;;
bsd* | hpux* | netbsd* | openbsd* | sunos*)
_unix=yes
_posix=yes
;;
cygwin*)
echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
@ -1572,7 +1572,7 @@ case $_host_os in
DEFINES="$DEFINES -DMACOSX"
LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
add_line_to_config_mk 'MACOSX = 1'
_unix=yes
_posix=yes
;;
dreamcast)
DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
@ -1598,7 +1598,7 @@ case $_host_os in
freebsd*)
LDFLAGS="$LDFLAGS -L/usr/local/lib"
CXXFLAGS="$CXXFLAGS -I/usr/local/include"
_unix=yes
_posix=yes
;;
gamecube)
CXXFLAGS="$CXXFLAGS -Os -mogc -mcpu=750 -meabi -mhard-float"
@ -1616,14 +1616,14 @@ case $_host_os in
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
# Needs -lnetwork for the timidity MIDI driver
LIBS="$LIBS -lnetwork"
_unix=yes
_posix=yes
_seq_midi=no
;;
irix*)
DEFINES="$DEFINES -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
LIBS="$LIBS -lmd -lfastm -lm"
_ranlib=:
_unix=yes
_posix=yes
;;
linux* | uclinux*)
# When not cross-compiling, enable large file support, but don't
@ -1631,7 +1631,7 @@ case $_host_os in
if test -z "$_host"; then
CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
fi
_unix=yes
_posix=yes
DEFINES="$DEFINES -DLUA_USE_POSIX"
;;
mingw*)
@ -1642,7 +1642,7 @@ case $_host_os in
;;
mint*)
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
_unix=yes
_posix=yes
;;
n64)
DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT"
@ -1651,7 +1651,7 @@ case $_host_os in
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
;;
os2-emx*)
_unix=yes # FIXME??? Why??
_posix=yes # FIXME??? Why??
;;
ps2)
# TODO ps2
@ -1669,7 +1669,7 @@ case $_host_os in
DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
# Needs -lbind -lsocket for the timidity MIDI driver
LIBS="$LIBS -lnsl -lsocket"
_unix=yes
_posix=yes
;;
webos)
CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
@ -1679,7 +1679,7 @@ case $_host_os in
LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
add_line_to_config_mk "WEBOS_SDK = $WEBOS_SDK"
_unix=yes
_posix=yes
_seq_midi=no
;;
wii)
@ -1699,10 +1699,10 @@ case $_host_os in
DEFINES="$DEFINES -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
;;
# given this is a shell script assume some type of unix
# given this is a shell script assume some type of posix
*)
echo "WARNING: could not establish system type, assuming unix like"
_unix=yes
_posix=yes
;;
esac
@ -1711,7 +1711,7 @@ if test -n "$_host"; then
echo "Cross-compiling to $_host"
case "$_host" in
android | android-v7a)
_unix=yes
_posix=yes
# we link a .so as default
LDFLAGS="$LDFLAGS -shared -Wl,-Bsymbolic,--no-undefined"
HOSTEXEPRE=lib
@ -1724,11 +1724,11 @@ if test -n "$_host"; then
_timidity=no
;;
arm-linux|arm*-linux-gnueabi|arm-*-linux)
_unix=yes
_posix=yes
;;
arm-riscos|linupy)
DEFINES="$DEFINES -DLINUPY"
_unix=yes
_posix=yes
;;
bfin*)
;;
@ -1744,7 +1744,7 @@ if test -n "$_host"; then
fi
CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS"
_unix=yes
_posix=yes
_backend="gph"
_build_hq_scalers=no
_vkeybd=yes
@ -1758,7 +1758,7 @@ if test -n "$_host"; then
_strip=$_host-strip
;;
dingux)
DEFINES="$DEFINES -DUNIX -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
DEFINES="$DEFINES -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
ASFLAGS="$ASFLAGS"
CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
_backend="dingux"
@ -1818,7 +1818,7 @@ if test -n "$_host"; then
CXXFLAGS="$CXXFLAGS -march=armv4t"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
LDFLAGS="$LDFLAGS -static"
_unix=yes
_posix=yes
_backend="gph"
_build_hq_scalers=no
_vkeybd=yes
@ -1836,7 +1836,7 @@ if test -n "$_host"; then
fi
CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
_unix=yes
_posix=yes
_backend="gph"
_build_hq_scalers=no
_vkeybd=yes
@ -1847,14 +1847,14 @@ if test -n "$_host"; then
;;
iphone)
DEFINES="$DEFINES -DIPHONE"
_unix=yes
_posix=yes
_backend="iphone"
_build_hq_scalers=no
_seq_midi=no
;;
m68k-atari-mint)
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
_unix=yes
_posix=yes
_ranlib=m68k-atari-mint-ranlib
_ar="m68k-atari-mint-ar cru"
_seq_midi=no
@ -1872,7 +1872,7 @@ if test -n "$_host"; then
motoezx)
DEFINES="$DEFINES -DMOTOEZX"
ASFLAGS="$ASFLAGS -mfpu=vfp"
_unix=yes
_posix=yes
_backend="linuxmoto"
_build_hq_scalers=no
_mt32emu=no
@ -1883,7 +1883,7 @@ if test -n "$_host"; then
motomagx)
DEFINES="$DEFINES -DMOTOMAGX"
ASFLAGS="$ASFLAGS -mfpu=vfp"
_unix=yes
_posix=yes
_backend="linuxmoto"
_build_hq_scalers=no
_mt32emu=no
@ -1915,7 +1915,7 @@ if test -n "$_host"; then
;;
neuros)
DEFINES="$DEFINES -DNEUROS"
_unix=yes
_posix=yes
_backend='null'
_build_hq_scalers=no
_mt32emu=no
@ -1930,7 +1930,7 @@ if test -n "$_host"; then
fi
CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
ASFLAGS="$ASFLAGS -mfloat-abi=soft"
_unix=yes
_posix=yes
_backend="openpandora"
_build_hq_scalers=yes
_vkeybd=no
@ -1979,13 +1979,13 @@ if test -n "$_host"; then
DEFINES="$DEFINES -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
ASFLAGS="$ASFLAGS -mfpu=vfp"
HOSTEXEEXT=".so"
_unix=yes
_posix=yes
_backend="samsungtv"
_mt32emu=no
_vkeybd=yes
;;
webos)
_unix=yes
_posix=yes
_backend="webos"
_port_mk="backends/platform/webos/webos.mk"
_build_scalers=no
@ -2228,9 +2228,9 @@ case $_endian in
;;
esac
if test "$_unix" = yes ; then
DEFINES="$DEFINES -DUNIX"
add_line_to_config_mk 'UNIX = 1'
if test "$_posix" = yes ; then
DEFINES="$DEFINES -DPOSIX"
add_line_to_config_mk 'POSIX = 1'
fi
#
@ -2697,9 +2697,9 @@ fi
echocheck "SEQ MIDI"
if test "$_seq_midi" = auto ; then
# TODO: Test for /dev/sequencer presence? Or maybe just for /dev ?
# For now, we just always enable it when "unix" mode is on (backends
# For now, we just always enable it when "posix" mode is on (backends
# that do not want it can disable it by setting _seq_midi=no).
_seq_midi="$_unix"
_seq_midi="$_posix"
fi
define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI'
echo "$_seq_midi"
@ -2712,7 +2712,7 @@ if test "$_timidity" = auto ; then
# TODO: Is there a good possibility of auto detecting whether we
# should include TiMidity support? It can only be used on Unix
# currently so we use that as "detection" for now.
_timidity="$_unix"
_timidity="$_posix"
fi
define_in_config_h_if_yes "$_timidity" 'USE_TIMIDITY'
echo "$_timidity"

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
#
# UNIX specific
# POSIX specific
#
install:
$(INSTALL) -d "$(DESTDIR)$(bindir)"