Ticket #9060: 20090801-trunk.patch

File 20090801-trunk.patch, 4.5 KB (added by CeRiAl, 11 years ago)

New SVN Diff (2009-08-01 13:00)

  • configure

     
    13331333                        type_2_byte='short'
    13341334                        type_4_byte='int'
    13351335                        add_line_to_config_mk 'USE_TREMOLO = 1'
    1336                         add_line_to_config_mk 'USE_MAD = 1'
    1337                         add_line_to_config_mk 'USE_MPEG2 = 1'
    1338                         add_line_to_config_mk 'USE_FLAC = 1'
    1339                         add_line_to_config_mk 'USE_ZLIB = 1'
    13401336                        add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
    13411337                        add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
    13421338                        add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
     
    20532049                LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
    20542050                ;;
    20552051        wince)
    2056                 INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/libs/include -I$(srcdir)/backends/platform/wince/libs/include/sdl -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
    2057                 LDFLAGS="$LDFLAGS "'-L$(srcdir)/backends/platform/wince/libs/lib'
     2052                INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
    20582053                LIBS="$LIBS -static -lSDL"
    20592054                ;;
    20602055        dc)
  • backends/platform/wince/module.mk

     
     1MODULE := backends/platform/wince
     2
     3MODULE_OBJS := \
     4        CEActionsPocket.o CEDevice.o CEScaler.o \
     5        CEActionsSmartphone.o CELauncherDialog.o wince-sdl.o \
     6        CEgui/GUIElement.o CEgui/Panel.o CEgui/SDL_ImageResource.o \
     7        CEgui/ItemAction.o CEgui/PanelItem.o CEgui/Toolbar.o \
     8        CEgui/ItemSwitch.o CEgui/PanelKeyboard.o CEgui/ToolbarHandler.o \
     9        CEkeys/EventsBuffer.o \
     10        ../../../gui/Actions.o ../../../gui/Key.o ../../../gui/KeysDialog.o \
     11        ../sdl/sdl.o ../sdl/graphics.o ../sdl/events.o ../sdl/hardwarekeys.o \
     12        missing/missing.o \
     13        PocketSCUMM.o \
     14        ARMscaler.o \
     15        smartLandScale.o
     16
     17MODULE_DIRS += \
     18        backends/platform/wince/
     19
     20# We don't use the rules.mk here on purpose
     21OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
  • backends/platform/wince/CEgui/SDL_ImageResource.cpp

     
    6060                _surface = SDL_LoadBMP_RW(surfaceData, 1);
    6161
    6262                return _surface;
    63         };
     63        }
    6464
    6565        SDL_Surface* SDL_ImageResource::get() {
    6666                return _surface;
  • backends/platform/wince/missing/missing.cpp

     
    135135#endif
    136136EXT_C void GetCurrentDirectory(int len, char *buf) {
    137137        getcwd(buf,len);
    138 };
     138}
    139139
     140
    140141/*
    141142Windows CE fopen has non-standard behavior -- not
    142143fully qualified paths refer to root folder rather
  • backends/platform/wince/wince.mk

     
     1all: PocketSCUMM.o
     2
     3PocketSCUMM.o: $(srcdir)/backends/platform/wince/PocketSCUMM.rc
     4        mkdir -p backends/platform/wince
     5        $(WINDRES) -I$(srcdir)/backends/platform/wince $(srcdir)/backends/platform/wince/PocketSCUMM.rc backends/platform/wince/PocketSCUMM.o
  • ports.mk

     
    205205        $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
    206206
    207207.PHONY: deb bundle osxsnap win32dist wiidist install uninstall
     208
     209#
     210# ARM specific
     211#
     212ifdef USE_TREMOLO
     213DEFINES += -DUSE_TREMOR -DUSE_VORBIS -DUSE_TREMOLO
     214LIBS += -ltremolo
     215endif
     216
     217ifdef USE_ARM_SMUSH_ASM
     218DEFINES += -DUSE_ARM_SMUSH_ASM
     219endif
     220
     221ifdef USE_ARM_SOUND_ASM
     222DEFINES += -DUSE_ARM_SOUND_ASM
     223endif
     224
     225ifdef USE_ARM_GFX_ASM
     226DEFINES += -DUSE_ARM_GFX_ASM
     227endif
     228
     229ifdef USE_ARM_COSTUME_ASM
     230DEFINES += -DUSE_ARM_COSTUME_ASM
     231endif
     232
     233ifdef USE_ARM_SCALER_ASM
     234DEFINES += -DUSE_ARM_SCALER_ASM
     235endif