From 9f61c17be77855b7d944680672a8a42841a5ecba Mon Sep 17 00:00:00 2001 From: aoki_ryoma Date: Fri, 18 Jul 2008 04:32:47 +0000 Subject: [PATCH] =?UTF-8?q?MAkefile=E3=81=AB=E3=81=8A=E3=81=91=E3=82=8B?= =?UTF-8?q?=E3=83=91=E3=82=B9=E3=81=AE=E8=A8=98=E8=BF=B0=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1942 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile | 5 +++-- build/tests/DisplaySystemInformation/ARM7_racoon/Makefile | 2 +- build/tests/DisplaySystemInformation/ARM9/Makefile | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile b/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile index 8703217d..45f7903d 100644 --- a/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile +++ b/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile @@ -24,7 +24,7 @@ TWL_NO_STD_PCHDR = True TWL_CODEGEN ?= ALL #---------------------------------------------------------------------------- -DISP_INFO = $(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) SRCS = overwriteRtc.c crt0.SCR.c main.c @@ -35,7 +35,7 @@ LCFILE_SPEC = $(TARGET_NAME).lsf LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template LDRES_TEMPLATE = $(TARGET_NAME).response.template -CRT0_O = $(DISP_INFO)/ARM7_armadillo/obj/ARM7-TS.LTD/Release/crt0.SCR.o +CRT0_O = crt0.SCR.o # スタック不足防止の為、インライン展開せずにコンパイルする CCFLAGS_OPT = -O4 -inline off @@ -66,6 +66,7 @@ LINCLUDES = $(ROOT)/build/libraries/spi/ARM7/include \ $(DISP_INFO)/common/include \ $(TWLSDK_ROOT)/build/libraries/init/common/include +LLIBRARY_DIRS += $(DISP_INFO)/ARM7_armadillo/obj/$(TWL_BUILDTYPE_ARM7) LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \ libsdio_sp$(TWL_LIBSUFFIX).a \ diff --git a/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile b/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile index 2917e382..fe4c0802 100644 --- a/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile +++ b/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile @@ -43,7 +43,7 @@ CCFLAGS_OPT = -O4 -inline off #---------------------------------------------------------------------------- include $(TWLSDK_ROOT)/build/buildtools/commondefs -DISP_INFO = $(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) #MACRO_FLAGS += -DSDK_ARM7COMP_LTD diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile b/build/tests/DisplaySystemInformation/ARM9/Makefile index f986f8f3..acb8aeb4 100644 --- a/build/tests/DisplaySystemInformation/ARM9/Makefile +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile @@ -23,7 +23,7 @@ DEFAULT_COMP_ARM7 = armadillo ROM_SPEC = main_$(DEFAULT_COMP_ARM7).rsf -DISP_INFO = $(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) SUBDIRS = @@ -41,7 +41,6 @@ SYSMENU_LIBS = \ libsysmenu$(TWL_LIBSUFFIX).a \ libsysmmcu$(TWL_LIBSUFFIX).a \ libsysmutil$(TWL_LIBSUFFIX).a \ - libbanner$(TWL_LIBSUFFIX).a \ libboot$(TWL_LIBSUFFIX).a \ libds$(TWL_LIBSUFFIX).a \ libhotsw$(TWL_LIBSUFFIX).a \