diff options
| author | Jordi Vilalta Prat | 2010-10-12 02:18:11 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2010-10-12 02:18:11 +0000 |
| commit | 8388e0dfea4ae0d80e51368acd12685c740c5bb5 (patch) | |
| tree | f960376a145a830cd77b08264c1412f71ec02f7e /backends/platform/n64 | |
| parent | 43161858ac14bae4ac6dea114d8b3e7a8c1b293b (diff) | |
| download | scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.tar.gz scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.tar.bz2 scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.zip | |
JANITORAL: Clean trailing whitespaces.
svn-id: r53160
Diffstat (limited to 'backends/platform/n64')
| -rw-r--r-- | backends/platform/n64/Makefile | 4 | ||||
| -rw-r--r-- | backends/platform/n64/README.N64 | 6 | ||||
| -rw-r--r-- | backends/platform/n64/module.mk | 2 | ||||
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile index f80aa29262..cffe277312 100644 --- a/backends/platform/n64/Makefile +++ b/backends/platform/n64/Makefile @@ -15,7 +15,7 @@ AR = $(GCCN64PREFIX)ar cru RANLIB = $(GCCN64PREFIX)ranlib DEFINES += -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DENABLE_VKEYBD -DUSE_ZLIB -LIBS += -lpakfs -lframfs -ln64 -ln64utils -lromfs +LIBS += -lpakfs -lframfs -ln64 -ln64utils -lromfs #DEFINES += -D_ENABLE_DEBUG_ @@ -31,7 +31,7 @@ DEFINES += -DUSE_VORBIS -DUSE_TREMOR LIBS += -lvorbisidec endif -LIBS += -lm -lstdc++ -lc -lgcc -lz -lnosys +LIBS += -lm -lstdc++ -lc -lgcc -lz -lnosys CXXFLAGS = -g -mno-extern-sdata -O2 --param max-inline-insns-auto=20 -fomit-frame-pointer -march=vr4300 -mtune=vr4300 -mhard-float -fno-rtti -fno-exceptions -Wno-multichar -Wshadow -I$(LIBN64PATH) -I$(TOOLPATH)/include -I./ -I$(srcdir) -I$(srcdir)/engines LDFLAGS = -g -march=vr4300 -mtune=vr4300 -nodefaultlibs -nostartfiles -mno-crt0 -L$(LIBN64PATH) -L$(TOOLPATH)/lib $(LIBS) -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map diff --git a/backends/platform/n64/README.N64 b/backends/platform/n64/README.N64 index c6ae6f021e..b47b239658 100644 --- a/backends/platform/n64/README.N64 +++ b/backends/platform/n64/README.N64 @@ -97,15 +97,15 @@ A - '.' / Skip dialogues in some games C buttons - Numeric keypad keys * Using a N64 Mouse: -Used like a normal PC mouse. +Used like a normal PC mouse. Notes ===== -- If virtual keyboard doesn't show up, you need to make sure you included +- If virtual keyboard doesn't show up, you need to make sure you included 'vkeybd_default.zip' in the root of your romfs image. -- In some games (mostly gob) cursor movement might be choppy, it's a known +- In some games (mostly gob) cursor movement might be choppy, it's a known problem and related on how N64 port manages screen updates. diff --git a/backends/platform/n64/module.mk b/backends/platform/n64/module.mk index 429b63802e..c8ceb32701 100644 --- a/backends/platform/n64/module.mk +++ b/backends/platform/n64/module.mk @@ -6,7 +6,7 @@ MODULE_OBJS := \ osys_n64_events.o \ osys_n64_utilities.o \ pakfs_save_manager.o \ - framfs_save_manager.o + framfs_save_manager.o # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index 5288ddbfce..8862693138 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -859,7 +859,7 @@ void OSystem_N64::getTimeAndDate(TimeDate &t) const { // No RTC inside the N64, read mips timer to simulate // passing of time, not a perfect solution, but can't think // of anything better. - + uint32 now = getMilliTick(); t.tm_sec = (now / 1000) % 60; |