ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
6575 Commits
Author SHA1 Message Date
Lars Persson 4863cf8aae Updated application icons 
svn-id: r20674
 2006-02-13 20:55:18 +00:00
Joost Peters 75b6b4b953 Fix compilation after engines moved to engines/ 
svn-id: r20670
 2006-02-13 18:21:22 +00:00
Won Star 1b459ee959 Whew. It seems that I made a mistake last time. :( 
Fix sound timer frequency for the GP32 port.

svn-id: r20668
 2006-02-13 13:46:38 +00:00
Won Star aaa11f6efb CC := arm-elf-gcc 
CXX		:= arm-elf-g++
LD		:= arm-elf-g++
AS		:= arm-elf-as
AR      := arm-elf-ar cru
RANLIB  := arm-elf-ranlib
RM      := rm -f
MKDIR   := mkdir -p
ECHO    := echo -n
CAT     := cat
RM      := rm -f
# recursive version of RM
RM_REC  := $(RM) -r
ZIP     := zip -q
CP      := cp
OBJCOPY	:= arm-elf-objcopy
FXETOOL	:= b2fxec


#######################################################################
# Default compilation parameters. Normally don't edit these           #
#######################################################################

CXXFLAGS:= -g -O
DEFINES :=
LDFLAGS :=
INCLUDES:= -I. -Icommon
LIBS	:=
OBJS	:=

# Turn on useful warnings
CXXFLAGS+= -Wall -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
CXXFLAGS+= -Wshadow -Wuninitialized -Wimplicit -Wundef
CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
CXXFLAGS+= -Wwrite-strings -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor

# GPSDK (SDK, Includes and Startup Files) base dir
GPSDK			=	/usr/compat/gp32/share/sdk

# Outputs
EXEEXT			=	.elf
MAPFILE			=	scummvm.map
BIN			=	scummvm.gxb
FXE			=	scummvm.fxe

# Stripped Build? (Smaller ELF, Minimal debug symbol information).
# You MUST comment this out with a # if you wish to debug your code.
# STRIP_DEBUG		=	-Wl,--strip-debug

# Plugins hack
srcdir			=	./

# GP32 Direct Execute Tool (i.e. pclink -e on Windows, gplink run on Linux)
EXECUTE_TOOL	=	pclink -e
#
#	       		-ffast-math \
#	       		-fshort-double \
#
#
#

				#-Wno-multichar \
				# Remove the below from the above flags for Debug.
CFLAGS		=	-marm -march=armv4t -mtune=arm920 -mapcs \
	       		-finline-functions \
	       		-fshort-enums \
	       		-mstructure-size-boundary=32 \
	       		-mno-thumb-interwork \
				-I$(GPSDK)/include \
				-g \
	       		-O2 \
	       		-fomit-frame-pointer

CPPFLAGS	=	$(CFLAGS)

DEFINES 	= 	-D__GP32__
DEFINES		+=	-DNONSTANDARD_PORT

# Support Vorbis Tremor Patches.
#DEFINES	+=	-DVORBIS_TREMOR

# Support LIBMAD Patches.
#DEFINES	+=	-DGP32_MADMP3

# Support for 8:3 save files names (The GP32 uses FAT12/16 (no vFAT) for the file system).
DEFINES		+=	-DSHORT_SAVENAMES

# Support for the unsigned sound mixer.
DEFINES		+=	-DOUTPUT_UNSIGNED_AUDIO

# Support for the GP32 (fmOPL derived) MIDI engine.
#	-	NOT fully implemented yet.
DEFINES		+=	-DUSE_GP32_FMOPL

LDSPECS		=	-specs=gp32_gpsdk.specs

LDFLAGS 	= 	$(STRIP_DEBUG) \
				-Wl,-Map,$(MAPFILE) \
				$(LDSPECS) -Wl,--no-warn-mismatch

LIBS		+=	-L$(GPSDK)/lib \
				-lgpmem -lgpos -lgpstdio -lgpstdlib -lgpsound -lgpgraphic -lgpfont \
				-lm -lc -lgcc

INCLUDES	+=	-Ibackends/gp32 -Iengines -I$(GPSDK)/include

MODULES		+=	backends/gp32

#GP32 Debug - Remove from Release builds
#	This builds in the GP32 GDB USB Stub. Don't use it unless you know what your doing.
#	You also need to remove ANY optemisation from the compiler flags.
#DEFINES	+=	-DGP32_GDB
#OBJS	+=	backends/gp32/debug-gdbstub-usb.o

# Standard librarys and optimization modules
OBJS	+=	backends/gp32/startup.o \
			backends/gp32/memcpy.o \
			backends/gp32/gp_asmlib.o \
			backends/gp32/gp_clipped.o \
			backends/gp32/fontdata.o

# Custom GP32 std library
OBJS	+=	backends/gp32/gp32std.o \
			backends/gp32/gp32std_grap.o \
			backends/gp32/gp32std_input.o \
			backends/gp32/gp32std_sound.o \
			#backends/gp32/dmaaudio_asm.o \
			#backends/gp32/dmaaudio.o \

#Main ScummVM for the GP32 Backend
OBJS	+= 	backends/gp32/gp32_main.o \
			backends/gp32/gp32_launcher.o \
			backends/gp32/gp32_osys.o \
			backends/gp32/gp-fs.o

#install: all
					#$(EXECUTE_TOOL) $(BIN)

$(FXE): $(BIN)
					$(FXETOOL) -f -a "The ScummVM Team" -t "ScummVM for the GP32" $< $@
#					$(FXETOOL) -f -a "The ScummVM Team" -t "ScummVM for the GP32" -b scummvm.bmp $< $@

$(BIN): scummvm$(EXEEXT)
					$(OBJCOPY) -O binary $< $@

#######################################################################
# Compile options - you can modify these to tweak ScummVM compilation #
#######################################################################

# Uncomment this to activate the MAD lib for compressed sound files
# DEFINES += -DUSE_MAD
# LIBS    += -lmad

# Uncomment this to activate the Ogg Vorbis lib for compressed sound files
# You MUST use Tremor for Ogg Vorbis support on the GP32 port.
# DEFINES += -DUSE_VORBIS
# LIBS    += -lvorbisfile -lvorbis

# Uncomment this to activate the ALSA lib for midi
# DEFINES += -DUSE_ALSA
# LIBS    += -lasound

# Uncomment this to cause warnings to be treated as errors
# CXXFLAGS+= -Werror

# Uncomment this to use GCC 3.x specific dependency tracking (recommended)
HAVE_GCC3 = 1

#######################################################################
# Control which modules are built - uncomment any to disable module   #
#######################################################################

DISABLE_SCALERS = 1
DISABLE_HQ_SCALERS = 1

#DISABLE_SCUMM = 1
#DISABLE_SCUMM_7_8 = 1
DISABLE_HE = 1
DISABLE_SIMON = 1
DISABLE_SKY = 1
DISABLE_QUEEN = 1


# The engines below are not supported on the GP32 port so there is
# no point compiling support into the binary.
DISABLE_SWORD1 = 1
DISABLE_SWORD2 = 1

# In-development engines below.
# Disable for ALL release builds.
DISABLE_SAGA = 1
DISABLE_KYRA = 1
DISABLE_GOB = 1

#######################################################################
# Misc stuff - you should normally never have to edit this            #
#######################################################################

EXECUTABLE := scummvm$(EXEEXT)

include Makefile.common

dist:
	$(RM) $(ZIPFILE)
	$(ZIP) $(ZIPFILE) $(DISTFILES)

install: $(FXE)
		$(EXECUTE_TOOL) $(BIN)	

svn-id: r20664
 2006-02-13 05:38:47 +00:00
Chris Apers adc73b773a Revamped launcher code 
+ more user freindly error message with ModImport
+ New direct mode code with some default option
+ Games data can now be directly in the Games folder using . as path
+ Added missing scummvm languages option
+ Added --render-mode option
+ Removed gfxMode, now only normal(1x) or wide
+ Added missing scummvm platforms option
+ Fixed per engine command line options
+ Alpha. ordered music drivers
+ Added 44khz (mainly for Zodiac) and FM Quality option
+ global command line options are now also used in direct mode
+ Added stylusClick, autoSave, advanced OS5 mode, optional led indicator, GoLCD API support
+ New feature to set ARM stack size
+ Fixed rotation problem

svn-id: r20656
 2006-02-12 20:13:08 +00:00
Chris Apers ff25c5c90a - Splitted AppStartCheckScreenSize from app.cpp rev19461, here is the palm standard one : SonyScreenSize 
svn-id: r20654
 2006-02-12 19:50:19 +00:00
Chris Apers b1edf73509 - Fixed bug #1329844, autooff not reset on exit 
- Splitted AppStartCheckScreenSize from app.cpp rev19461, here is the palm standard one : PalmScreenSize
- Move PalmGetMemory here from file forminfo.cpp rev18604

svn-id: r20653
 2006-02-12 19:47:30 +00:00
Chris Apers 0bedb9fd57 Cleanup 
svn-id: r20650
 2006-02-12 19:32:54 +00:00
Chris Apers 1434ff868b - Removed obsolete ARM stuff, modules are now almost-fully ARM 
- Added autosave period and OS5 ARM advanced mode
- indicator can also be use with 16bit display

svn-id: r20649
 2006-02-12 19:31:40 +00:00
Chris Apers 08efabc14d New feature to pass selected stack size to modules 
svn-id: r20648
 2006-02-12 19:27:48 +00:00
Chris Apers d6be9bcada Not available in ARM mode for now 
svn-id: r20647
 2006-02-12 19:25:13 +00:00
Chris Apers d3b902ac25 Fixed header, sorry 
svn-id: r20646
 2006-02-12 19:21:52 +00:00
Chris Apers 852094a6f6 - Use WinSetCoord only when needed, this fix some system redraw problems 
- Get rid of Win*Lock functions, safer
- OSD (mainly DrawStatus) can now be use in 16bit mode too
- Move redawOSD to the base class
- Updated draw_osd function with standard PalmOS functions instead of Zodiac API, this draw_osd use big endian resources where OS5 version us little endian

svn-id: r20645
 2006-02-12 19:20:26 +00:00
Chris Apers aa83040c0a It is _soundEx now 
svn-id: r20640
 2006-02-12 19:01:49 +00:00
Chris Apers 5e4a4f779d - Removed unused StrReplace function 
- DrawStatus now support 8 and 16bit display
- Coordinate system is now used correctly (set only when needed), no more need to reset it in PalmFatalError
- Added new/delete operators for ARM OS5 mode

svn-id: r20638
 2006-02-12 18:58:54 +00:00
Chris Apers 3dc99262a2 - Removed obsolete DEBUG defines 
- Added LURE and OS5 defines

svn-id: r20637
 2006-02-12 18:39:43 +00:00
Chris Apers 5975bd1fe6 - Added ARM module launcher 
- Updated 68k launcher with lastest changes to gVars
  + GoLCD API support
  + Fix for invisible DIA using Stuffs*VG functions
  + New communication process between frontend and module to know if the module needs extra files
  + Get free memory at startup

svn-id: r20636
 2006-02-12 18:36:57 +00:00
Chris Apers 353ea3881f New definitions for frontend <-> module communication 
svn-id: r20635
 2006-02-12 18:30:15 +00:00
Chris Apers f74801e42c Only in ARM mode 
svn-id: r20634
 2006-02-12 18:28:11 +00:00
Chris Apers 0ffdbdd7af -mMove PalmOS project file to a more appropriate place 
svn-id: r20632
 2006-02-12 17:09:42 +00:00
Lars Persson 009354961d Removed egcc lib from S60V3 mmp file. 
svn-id: r20619
 2006-02-12 15:01:32 +00:00
Lars Persson 692adbe614 Changed file paths from /epoc/ to /symbian/ 
svn-id: r20618
 2006-02-12 14:42:43 +00:00
Lars Persson 25460eb0fa Renaming the folder "epoc"->"symbian" 
svn-id: r20612
 2006-02-12 13:40:20 +00:00
Lars Persson 92cfa0aa68 svn-id: r20606 2006-02-12 13:08:11 +00:00
Joost Peters c595b65aba openCD() and pollCD() should return false, since they don't actually access a CD. 
This avoids some common pitfalls in new backends based off of this, like e.g. the hang on the final chapter screen in MI1CD.

svn-id: r20588
 2006-02-12 01:06:26 +00:00
Lars Persson 37f433a7ad * New and tested builds for S60V3 and UIQ3 
* New upscaled icons for UIQ3/S60V3. SVG/Scalable version needed for S60V3 for proper good looks
* Critical bug in Symbian-fs fixed (exception for UIQ3/S60V3)
*Removed duplicate files for easier maintanence
*New handling for Symbian error messages, save paths etc
*All naming now is ScummVM for all apps and targets

svn-id: r20585
 2006-02-12 00:27:19 +00:00
Max Horn 80cf2fa46f Reduced data duplication in module.mk files; added module.mk files for null and x11 backends; added engines/module.mk 
svn-id: r20584
 2006-02-12 00:16:31 +00:00
Max Horn 136ecfc1e8 Fixed the list of backend factory functions 
svn-id: r20583
 2006-02-11 23:43:24 +00:00
Chris Apers bd39c3cb3e Forgot this one 
svn-id: r20577
 2006-02-11 19:09:09 +00:00
Chris Apers fde4fd87e7 Bye bye 
svn-id: r20576
 2006-02-11 19:08:25 +00:00
Chris Apers 0a5cd1ce98 Disable Adlib on PalmOS 68k devices 
svn-id: r20575
 2006-02-11 19:01:06 +00:00
Chris Apers 87f6c76722 This is now required 
svn-id: r20574
 2006-02-11 18:57:43 +00:00
Chris Apers 79f94b3cb2 Ooops 
svn-id: r20573
 2006-02-11 18:55:39 +00:00
Chris Apers 9d8c0acbc4 Move show/hideOverlay to OS5 class (should be in Base ?) 
svn-id: r20572
 2006-02-11 18:53:58 +00:00
Chris Apers 26a3285b53 Move setMouseCursor to OS5 class 
svn-id: r20571
 2006-02-11 18:52:32 +00:00
Chris Apers 9649fb50f3 - Fixed volRefNum default value 
- Added autosave option

svn-id: r20570
 2006-02-11 18:49:05 +00:00
Chris Apers 98bb8ce5a9 No more required 
svn-id: r20569
 2006-02-11 18:47:23 +00:00
Chris Apers 8f3ae56c69 Fixed volRefNum default value 
svn-id: r20568
 2006-02-11 18:45:00 +00:00
Chris Apers 4f41e84f51 Not more required 
svn-id: r20567
 2006-02-11 18:42:32 +00:00
Chris Apers 62b5df4e7b Added new engine, platform and language 
svn-id: r20566
 2006-02-11 18:41:00 +00:00
Chris Apers 044d5164a1 Updated header 
svn-id: r20565
 2006-02-11 18:36:40 +00:00
Chris Apers 9e3ee81579 Updated header 
svn-id: r20564
 2006-02-11 18:34:49 +00:00
Chris Apers f20193af5f - Get rid of MemGluePtrNew 
- Fixed exit function in ARM mode
- Fixed C++ compilation

svn-id: r20563
 2006-02-11 18:31:05 +00:00
Chris Apers 5638fae439 - Added NVFS support 
- Fixed volRefNum default value
- Get rid of MemGluePtrNew when possible
- Fixed vsprintf in ARM mode

svn-id: r20562
 2006-02-11 18:28:02 +00:00
Chris Apers 9b1d8dc114 Fixed driver test 
svn-id: r20561
 2006-02-11 18:24:42 +00:00
Chris Apers 2552211aaa - Added autosave period option 
- Added OS5 advanced mode
- Added scummvm header

svn-id: r20560
 2006-02-11 18:23:29 +00:00
Chris Apers f32a6e5c67 Fixed default volRefNum value 
- Added scummvm header

svn-id: r20559
 2006-02-11 18:20:17 +00:00
Chris Apers 65ed0e0ded - Added FileBrowser API support to get the game path 
- Added scummvm header
- Typo

svn-id: r20558
 2006-02-11 18:18:50 +00:00
Chris Apers a474940a33 - Added NVFS support 
- Fixed default volRefNum value
- Added scummvm header

svn-id: r20557
 2006-02-11 18:16:19 +00:00
Chris Apers dfa1a254f6 Fixed default volRefNum value 
- Init MathLib only on non-ARM devices
- Added scummvm header
- Removed obsolete code

svn-id: r20556
 2006-02-11 18:12:51 +00:00