aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorAlexander Tkachev2016-07-20 13:51:06 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commit0200694dd050409eec7a30efd8a616ab6b1fdae1 (patch)
tree87c5b44844a67f9130acd8704b6de5649bb0bb74 /backends
parente833c8f65c05a1db182d4982d4e1b8edfe014980 (diff)
downloadscummvm-rg350-0200694dd050409eec7a30efd8a616ab6b1fdae1.tar.gz
scummvm-rg350-0200694dd050409eec7a30efd8a616ab6b1fdae1.tar.bz2
scummvm-rg350-0200694dd050409eec7a30efd8a616ab6b1fdae1.zip
CLOUD: Fix backends/module.mk
MinGW failed to compile with the latest fix. Checked this fix with create_project for MSVC, MinGW's make, make under kubuntu and while building Android apk.
Diffstat (limited to 'backends')
-rw-r--r--backends/module.mk120
1 files changed, 50 insertions, 70 deletions
diff --git a/backends/module.mk b/backends/module.mk
index d7728dc092..c402a10a90 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -150,37 +150,51 @@ MODULE_OBJS += \
endif
endif
-ifdef POSIX
-MODULE_OBJS += \
- fs/posix/posix-fs.o \
- fs/posix/posix-fs-factory.o \
- fs/chroot/chroot-fs-factory.o \
- fs/chroot/chroot-fs.o \
- plugins/posix/posix-provider.o \
- saves/posix/posix-saves.o \
- taskbar/unity/unity-taskbar.o
-
+# openUrl
ifeq ($(BACKEND),android)
MODULE_OBJS += \
- networking/browser/openurl-android.o \
- networking/connection/islimited-android.o
+ networking/browser/openurl-android.o
else
ifdef MACOSX
MODULE_OBJS += \
- networking/browser/openurl-osx.o \
- networking/connection/islimited-default.o
+ networking/browser/openurl-osx.o
else
ifdef WIN32
MODULE_OBJS += \
- networking/browser/openurl-windows.o \
- networking/connection/islimited-default.o
+ networking/browser/openurl-windows.o
else
-MODULE_OBJS += \
- networking/browser/openurl-posix.o \
- networking/connection/islimited-default.o
+ ifdef POSIX
+ MODULE_OBJS += \
+ networking/browser/openurl-posix.o
+ else
+ # create_project doesn't know something about `else`
+ ifndef WIN32
+ MODULE_OBJS += \
+ networking/browser/openurl-default.o
+ endif
+ endif
endif
endif
endif
+
+# Connection::isLimited
+ifeq ($(BACKEND),android)
+MODULE_OBJS += \
+ networking/connection/islimited-android.o
+else
+MODULE_OBJS += \
+ networking/connection/islimited-default.o
+endif
+
+ifdef POSIX
+MODULE_OBJS += \
+ fs/posix/posix-fs.o \
+ fs/posix/posix-fs-factory.o \
+ fs/chroot/chroot-fs-factory.o \
+ fs/chroot/chroot-fs.o \
+ plugins/posix/posix-provider.o \
+ saves/posix/posix-saves.o \
+ taskbar/unity/unity-taskbar.o
endif
ifdef MACOSX
@@ -207,18 +221,14 @@ endif
ifeq ($(BACKEND),androidsdl)
MODULE_OBJS += \
events/androidsdl/androidsdl-events.o \
- graphics/androidsdl/androidsdl-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/androidsdl/androidsdl-graphics.o
endif
ifdef AMIGAOS
MODULE_OBJS += \
fs/amigaos4/amigaos4-fs.o \
fs/amigaos4/amigaos4-fs-factory.o \
- midi/camd.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ midi/camd.o
endif
ifdef PLAYSTATION3
@@ -226,9 +236,7 @@ MODULE_OBJS += \
fs/posix/posix-fs.o \
fs/posix/posix-fs-factory.o \
fs/ps3/ps3-fs-factory.o \
- events/ps3sdl/ps3sdl-events.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ events/ps3sdl/ps3sdl-events.o
endif
ifdef USE_LINUXCD
@@ -238,76 +246,58 @@ endif
ifeq ($(BACKEND),tizen)
MODULE_OBJS += \
- timer/tizen/timer.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ timer/tizen/timer.o
endif
ifeq ($(BACKEND),ds)
MODULE_OBJS += \
fs/ds/ds-fs.o \
fs/ds/ds-fs-factory.o \
- plugins/ds/ds-provider.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ plugins/ds/ds-provider.o
endif
ifeq ($(BACKEND),dingux)
MODULE_OBJS += \
events/dinguxsdl/dinguxsdl-events.o \
- graphics/dinguxsdl/dinguxsdl-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/dinguxsdl/dinguxsdl-graphics.o
endif
ifeq ($(BACKEND),gph)
MODULE_OBJS += \
events/gph/gph-events.o \
- graphics/gph/gph-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/gph/gph-graphics.o
endif
ifeq ($(BACKEND),linuxmoto)
MODULE_OBJS += \
events/linuxmotosdl/linuxmotosdl-events.o \
- graphics/linuxmotosdl/linuxmotosdl-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/linuxmotosdl/linuxmotosdl-graphics.o
endif
ifeq ($(BACKEND),maemo)
MODULE_OBJS += \
events/maemosdl/maemosdl-events.o \
- graphics/maemosdl/maemosdl-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/maemosdl/maemosdl-graphics.o
endif
ifeq ($(BACKEND),n64)
MODULE_OBJS += \
fs/n64/n64-fs.o \
fs/n64/n64-fs-factory.o \
- fs/n64/romfsstream.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ fs/n64/romfsstream.o
endif
ifeq ($(BACKEND),openpandora)
MODULE_OBJS += \
events/openpandora/op-events.o \
- graphics/openpandora/op-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/openpandora/op-graphics.o
endif
ifeq ($(BACKEND),ps2)
MODULE_OBJS += \
fs/ps2/ps2-fs.o \
fs/ps2/ps2-fs-factory.o \
- plugins/ps2/ps2-provider.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ plugins/ps2/ps2-provider.o
endif
ifeq ($(BACKEND),psp)
@@ -317,24 +307,18 @@ MODULE_OBJS += \
fs/psp/psp-stream.o \
plugins/psp/psp-provider.o \
saves/psp/psp-saves.o \
- timer/psp/timer.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ timer/psp/timer.o
endif
ifeq ($(BACKEND),samsungtv)
MODULE_OBJS += \
events/samsungtvsdl/samsungtvsdl-events.o \
- graphics/samsungtvsdl/samsungtvsdl-graphics.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ graphics/samsungtvsdl/samsungtvsdl-graphics.o
endif
ifeq ($(BACKEND),webos)
MODULE_OBJS += \
- events/webossdl/webossdl-events.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ events/webossdl/webossdl-events.o
endif
ifeq ($(BACKEND),wince)
@@ -344,18 +328,14 @@ MODULE_OBJS += \
fs/windows/windows-fs-factory.o \
graphics/wincesdl/wincesdl-graphics.o \
mixer/wincesdl/wincesdl-mixer.o \
- plugins/win32/win32-provider.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ plugins/win32/win32-provider.o
endif
ifeq ($(BACKEND),wii)
MODULE_OBJS += \
fs/wii/wii-fs.o \
fs/wii/wii-fs-factory.o \
- plugins/wii/wii-provider.o \
- networking/browser/openurl-default.o \
- networking/connection/islimited-default.o
+ plugins/wii/wii-provider.o
endif
ifdef ENABLE_EVENTRECORDER