libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 01:15:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

further tweaks to Makefile and main linker

Browse Source 
svn-id: r49422
This commit is contained in:
Tony Puccinelli 2010-06-04 07:46:07 +00:00
parent f47d5bd35a
commit 28e28a2fea
2 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
backends/platform/ps2/Makefile.ps2
View File

@ -6,7 +6,7 @@ PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /vorbis /tremor/tremor PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /vorbis /tremor/tremor
# Set to 1 to enable, 0 to disable dynamic modules # Set to 1 to enable, 0 to disable dynamic modules
DYNAMIC_MODULES = 0 DYNAMIC_MODULES = 1
VERBOSE_BUILD=0 VERBOSE_BUILD=0
@ -17,34 +17,32 @@ DEFINES += -DDYNAMIC_MODULES
PRE_OBJS_FLAGS = -Wl,--whole-archive PRE_OBJS_FLAGS = -Wl,--whole-archive
POST_OBJS_FLAGS = -Wl,--no-whole-archive POST_OBJS_FLAGS = -Wl,--no-whole-archive
else else
PRE_OBJS_FLAGS =
POST_OBJS_FLAGS =
ENABLED = STATIC_PLUGIN ENABLED = STATIC_PLUGIN
endif endif
ENABLE_SCUMM = $(ENABLED) #ENABLE_SCUMM = $(ENABLED)
ENABLE_SCUMM_7_8 = $(ENABLED) #ENABLE_SCUMM_7_8 = $(ENABLED)
ENABLE_HE = $(ENABLED) #ENABLE_HE = $(ENABLED)
ENABLE_AGI = $(ENABLED) #ENABLE_AGI = $(ENABLED)
ENABLE_AGOS = $(ENABLED) #ENABLE_AGOS = $(ENABLED)
ENABLE_CINE = $(ENABLED) #ENABLE_CINE = $(ENABLED)
ENABLE_CRUISE = $(ENABLED) #ENABLE_CRUISE = $(ENABLED)
ENABLE_DRASCULA = $(ENABLED) #ENABLE_DRASCULA = $(ENABLED)
ENABLE_GOB = $(ENABLED) #ENABLE_GOB = $(ENABLED)
ENABLE_KYRA = $(ENABLED) #ENABLE_KYRA = $(ENABLED)
ENABLE_LURE = $(ENABLED) #ENABLE_LURE = $(ENABLED)
# ENABLE_M4 = $(ENABLED) # ENABLE_M4 = $(ENABLED)
ENABLE_MADE = $(ENABLED) #ENABLE_MADE = $(ENABLED)
ENABLE_PARALLACTION = $(ENABLED) #ENABLE_PARALLACTION = $(ENABLED)
ENABLE_QUEEN = $(ENABLED) #ENABLE_QUEEN = $(ENABLED)
ENABLE_SAGA = $(ENABLED) #ENABLE_SAGA = $(ENABLED)
ENABLE_SAGA2 = $(ENABLED) #ENABLE_SAGA2 = $(ENABLED)
ENABLE_IHNM = $(ENABLED) #ENABLE_IHNM = $(ENABLED)
ENABLE_SKY = $(ENABLED) #ENABLE_SKY = $(ENABLED)
ENABLE_SWORD1 = $(ENABLED) #ENABLE_SWORD1 = $(ENABLED)
ENABLE_SWORD2 = $(ENABLED) #ENABLE_SWORD2 = $(ENABLED)
# ENABLE_TINSEL = $(ENABLED) # ENABLE_TINSEL = $(ENABLED)
ENABLE_TOUCHE = $(ENABLED) #ENABLE_TOUCHE = $(ENABLED)
HAVE_GCC3 = true HAVE_GCC3 = true
@ -62,20 +60,20 @@ srcdir = ../../..
VPATH = $(srcdir) VPATH = $(srcdir)
INCDIR = ../../../ INCDIR = ../../../
#DEPDIR = .deps #DEPDIR = .deps
#CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d,-MQ,"$@",-MP #CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
# Variables for dynamic plugin building # Variables for dynamic plugin building
PLUGIN_PREFIX = PLUGIN_PREFIX =
PLUGIN_SUFFIX = .plg PLUGIN_SUFFIX = .plg
PLUGIN_EXTRA_DEPS = plugin.syms scummvm-ps2.elf PLUGIN_EXTRA_DEPS = plugin.syms elf/scummvm.elf
PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols=scummvm-ps2.org.elf,-Tplugin.ld,--retain-symbols-file,plugin.syms -lstdc++ -lc PLUGIN_LDFLAGS = -nostartfiles -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-q,--just-symbols=elf/scummvm.org.elf,-Tlinkfile,--retain-symbols-file,plugin.syms -lstdc++ -lc
DEFINES = -DUSE_VORBIS -DUSE_MAD -DUSE_TREMOR -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar DEFINES = -DUSE_VORBIS -DUSE_MAD -DUSE_TREMOR -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
TARGET = elf/scummvm.elf TARGET = elf/scummvm
OBJS := backends/platform/ps2/DmaPipe.o \ OBJS := backends/platform/ps2/DmaPipe.o \
backends/platform/ps2/Gs2dScreen.o \ backends/platform/ps2/Gs2dScreen.o \
@ -99,13 +97,18 @@ MODULE_DIRS += .
include $(srcdir)/Makefile.common include $(srcdir)/Makefile.common
LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T main_prog.ld LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T main_prog.ld #$(PS2SDK)/ee/startup/linkfile
LDFLAGS += -L $(PS2SDK)/ee/lib -L . LDFLAGS += -G 0 -L $(PS2SDK)/ee/lib -L .
LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS)) LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS))
LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++ LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++
LDFLAGS += -s LDFLAGS +=
all: $(TARGET) all: $(TARGET).ps2
$(TARGET): $(OBJS) $(TARGET).elf: $(OBJS)
$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) -o $@ $(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) -o $@
cp $(TARGET).elf $(TARGET).org.elf
$(TARGET).ps2: $(TARGET).elf
rm $(TARGET).elf
rm $(TARGET).org.elf

15
backends/platform/ps2/main_prog.ld
View File

@ -1,16 +1,3 @@
/*
# _____ ___ ____ ___ ____
# ____| | ____| | | |____|
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
#-----------------------------------------------------------------------
# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
# Licenced under Academic Free License version 2.0
# Review ps2sdk README & LICENSE files for further details.
#
# $Id: linkfile 798 2005-02-07 06:21:37Z herben $
# Linkfile script for ee-ld
*/
ENTRY(_start); ENTRY(_start);
SECTIONS { SECTIONS {
@ -91,7 +78,7 @@ SECTIONS {
{ {
*(COMMON) *(COMMON)
} }
. = ALIGN(32 / 8); . = ALIGN(128);
.bss ALIGN(128) : { .bss ALIGN(128) : {
*(.bss) *(.bss)