libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Relocated Win32 and Posix ports. (Part 2)

Browse Source 
svn-id: r50193
This commit is contained in:
Alejandro Marzini 2010-06-23 21:07:03 +00:00
parent 1069be7f9b
commit 3af9282c19
8 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backends/platform/sdl/module.mk
View File

@ -1,6 +1,10 @@
MODULE := backends/platform/sdl
MODULE_OBJS := \
posix/main.o \
posix/posix.o \
win32/main.o \
win32/win32.o \
hardwarekeys.o \
main.o \
sdl.o

6
backends/platform/sdl/posix/main.cpp
View File

@ -23,9 +23,11 @@
*
*/
#ifdef UNIX
#include "common/scummsys.h"
#include "backends/platform/posix/posix.h"
#include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
@ -44,3 +46,5 @@ int main(int argc, char *argv[]) {
delete (OSystem_POSIX *)g_system;
return res;
}
#endif

11
backends/platform/sdl/posix/module.mk
View File

@ -1,11 +0,0 @@
MODULE := backends/platform/posix
MODULE_OBJS := \
main.o \
posix.o
MODULE_DIRS += \
backends/platform/posix/
# We don't use the rules.mk here on purpose
OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)

6
backends/platform/sdl/posix/posix.cpp
View File

@ -23,7 +23,9 @@
*
*/
#include "backends/platform/posix/posix.h"
#ifdef UNIX
#include "backends/platform/sdl/posix/posix.h"
#include "common/archive.h"
#include "common/config-manager.h"
#include "common/debug.h"
@ -74,3 +76,5 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() {
return configFile;
}
#endif

6
backends/platform/sdl/win32/main.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef WIN32
// Fix for bug #2895217 "MSVC compilation broken with r47595":
// We need to keep this on top of the "common/scummsys.h" include,
// otherwise we will get errors about the windows headers redefining
@ -33,7 +35,7 @@
#include "common/scummsys.h"
#include "backends/platform/win32/win32.h"
#include "backends/platform/sdl/win32/win32.h"
#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
@ -57,3 +59,5 @@ int main(int argc, char *argv[]) {
delete (OSystem_Win32 *)g_system;
return res;
}
#endif

11
backends/platform/sdl/win32/module.mk
View File

@ -1,11 +0,0 @@
MODULE := backends/platform/win32
MODULE_OBJS := \
main.o \
win32.o
MODULE_DIRS += \
backends/platform/win32/
# We don't use the rules.mk here on purpose
OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)

6
backends/platform/sdl/win32/win32.cpp
View File

@ -23,11 +23,13 @@
*
*/
#ifdef WIN32
#include <windows.h>
// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h
#undef ARRAYSIZE
#include "backends/platform/win32/win32.h"
#include "backends/platform/sdl/win32/win32.h"
#include "common/archive.h"
#include "common/config-manager.h"
#include "common/debug.h"
@ -96,3 +98,5 @@ Common::String OSystem_Win32::getDefaultConfigFileName() {
return configFile;
}
#endif

1
tools/create_msvc/create_msvc.cpp
View File

@ -990,7 +990,6 @@ void ProjectProvider::createMSVCProject(const BuildSetup &setup) {
// File list for the ScummVM project file
createModuleList(setup.srcDir + "/backends", setup.defines, in, ex);
createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, in, ex);
createModuleList(setup.srcDir + "/backends/platform/win32", setup.defines, in, ex);
createModuleList(setup.srcDir + "/base", setup.defines, in, ex);
createModuleList(setup.srcDir + "/common", setup.defines, in, ex);
createModuleList(setup.srcDir + "/engines", setup.defines, in, ex);