rvtr/twl_wrapsdk
1
Fork 0
mirror of https://github.com/rvtr/twl_wrapsdk.git synced 2025-10-31 06:11:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

support new ISTDPrint.

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@274 4ee2a332-4b2b-5046-8439-1ba90f034370
This commit is contained in:
nakasima 2007-09-14 00:36:55 +00:00
parent 53d4ca080e
commit 4d15df5766
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/buildtools/commondefs
View File

@ -245,13 +245,9 @@ include $(TWL_BUILDTOOLSDIR)/commondefs.emtype.ISD
GINCLUDES := $(TWL_INCDIR) $(TWL_ISD_INCDIRS) $(GINCLUDES) GINCLUDES := $(TWL_INCDIR) $(TWL_ISD_INCDIRS) $(GINCLUDES)
GLIBRARY_DIRS := $(TWL_LIBDIR) $(dir $(TWL_LIBSYSCALL)) $(TWL_ISD_LIBDIRS) $(GLIBRARY_DIRS) GLIBRARY_DIRS := $(TWL_LIBDIR) $(dir $(TWL_LIBSYSCALL)) $(TWL_ISD_LIBDIRS) $(GLIBRARY_DIRS)
GLIBRARIES := $(TWL_LIBS) \ GLIBRARIES := $(TWL_LIBS) $(TWL_ISD_LIBS) \
$(filter-out $(addsuffix $(NITRO_LIBSUFFIX).a,$(TWL_LIBS_BASE)),$(GLIBRARIES)) $(filter-out $(addsuffix $(NITRO_LIBSUFFIX).a,$(TWL_LIBS_BASE)),$(GLIBRARIES))
ifdef IS_TWL_DEBUGGER_DIR
GLIBRARY_DIRS := $(filter-out $(ISD_LIBDIRS),$(GLIBRARY_DIRS))
endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# TWLSDK_INSTALL_ROOT # TWLSDK_INSTALL_ROOT
# #

16
build/buildtools/commondefs.emtype.ISD
View File

@ -31,12 +31,24 @@ TWL_ISD_ROOT_NOSPACE := $(subst \,/,$(shell cygpath -d $(TWL_ISD_ROOT)))
ifeq ($(CODEGEN_PROC),ARM9) ifeq ($(CODEGEN_PROC),ARM9)
TWL_ISD_INCDIRS := $(TWL_ISD_ROOT)/Target/include/ARM9 TWL_ISD_INCDIRS := $(TWL_ISD_ROOT)/Target/include/ARM9
TWL_ISD_LIBDIRS := $(TWL_ISD_ROOT_NOSPACE)/Target\lib\ARM9-TS TWL_ISD_LIBDIRS := $(TWL_ISD_ROOT_NOSPACE)/Target/lib/ARM9-TS
ifeq ($(TWL_CODEGEN),ARM)
TWL_ISD_LIBS := libistdmainparm.a
else # ($(TWL_CODEGEN),THUMB)
TWL_ISD_LIBS := libistdmainpthumb.a
endif
else # ($(CODEGEN_PROC),ARM7) else # ($(CODEGEN_PROC),ARM7)
TWL_ISD_INCDIRS := $(TWL_ISD_ROOT)/Target/include/ARM7 TWL_ISD_INCDIRS := $(TWL_ISD_ROOT)/Target/include/ARM7
TWL_ISD_LIBDIRS := $(TWL_ISD_ROOT_NOSPACE)/Target\lib\ARM7-TS TWL_ISD_LIBDIRS := $(TWL_ISD_ROOT_NOSPACE)/Target/lib/ARM7-TS
ifeq ($(TWL_CODEGEN),ARM)
TWL_ISD_LIBS := libistdsubparm.a
else # ($(TWL_CODEGEN),THUMB)
TWL_ISD_LIBS := libistdsubpthumb.a
endif
endif endif

10
build/libraries/os/common/os_printf.c
View File

@ -184,14 +184,14 @@
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <twl.h> #include <twl.h>
#include <twl/vlink.h> #include <twl/vlink.h>
#include <isdbglibpriv.h> #include <istdbglibpriv.h>
#ifdef SDK_LINK_ISD #ifdef SDK_LINK_ISD
# pragma warn_extracomma off # pragma warn_extracomma off
# include <isdbglib.h> // has extracomma in enum # include <istdbglib.h> // has extracomma in enum
# pragma warn_extracomma reset # pragma warn_extracomma reset
#else #else
void ISDPrint(const char *); void ISTDPrint(const char *);
#endif #endif
#ifndef SDK_FINALROM #ifndef SDK_FINALROM
@ -284,7 +284,7 @@ static void OS_PutStringInit(const char *str)
#endif #endif
OS_PutString = OS_PutStringKMC; OS_PutString = OS_PutStringKMC;
#if defined( SDK_DEBUGGER_ISD ) #if defined( SDK_DEBUGGER_ISD )
_ISDbgLib_Initialize(); _ISTDbgLib_Initialize();
OS_PutString = OS_PutStringISD; OS_PutString = OS_PutStringISD;
#elif defined( SDK_DEBUGGER_ARM ) #elif defined( SDK_DEBUGGER_ARM )
OS_PutString = OS_PutStringARM; OS_PutString = OS_PutStringARM;
@ -336,7 +336,7 @@ static void OS_PutStringISD(const char *str)
// ISDPrint ‚Ì<E2809A>‰Šú‰»<E280B0>ˆ—<CB86> // ISDPrint ‚Ì<E2809A>‰Šú‰»<E280B0>ˆ—<CB86>
OS_InitLock(); OS_InitLock();
OS_PutString = ISDPrint; OS_PutString = ISTDPrint;
OS_PutString(str); OS_PutString(str);
} }
#endif #endif