adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unnecessary detections, support for S60 SDK version >3.0

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3073 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2008-09-19 22:29:30 +00:00
parent 1448372b98
commit 84769e71ad
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/INSTALL.symbian
+3 -4
View File
@@ -20,9 +20,8 @@ Prerequisites:
- Platform SDK for S60 3rd ed. - Platform SDK for S60 3rd ed.
* Download from http://www.forum.nokia.com/ * Download from http://www.forum.nokia.com/
* 3rd ed. MR was used for development, FP1 and FP2 have not been tested
- Open C plugins (if SDK is other than FP2; in FP2 those should be included already) - Open C plugins (if SDK is other than FP2; in FP2 those are included already)
* Download from http://www.forum.nokia.com/main/resources/tools_and_sdks/openc_cpp/ * Download from http://www.forum.nokia.com/main/resources/tools_and_sdks/openc_cpp/
- Carbide.c++ (if building for emulator) - Carbide.c++ (if building for emulator)
@@ -82,5 +81,5 @@ Building:
10) If you built for GCCE or ARMV5, you should now have uqm.sisx in the same 10) If you built for GCCE or ARMV5, you should now have uqm.sisx in the same
directory from where you did the build. Remember to also install SDL SIS directory from where you did the build. Remember to also install SDL SIS
package and if not using FP2 SDK, Open C plugins before attempting to run package and if device does not support FP2, Open C plugins before
UQM on actual device. attempting to run UQM on actual device.
sc2/build/unix/build.config
+6
View File
@@ -30,6 +30,12 @@ uqm_requirements()
use_library SDL 1.2.8 || exit 1 use_library SDL 1.2.8 || exit 1
use_library SDL_image || exit 1 use_library SDL_image || exit 1
case "$HOST_SYSTEM" in
WINSCW|ARMV5|GCCE)
# Symbian does not use dynamically generated config.h
return
;;
esac
# Add defines for HAVE_READDIR_R, HAVE_SETENV, HAVE_STRUPR, # Add defines for HAVE_READDIR_R, HAVE_SETENV, HAVE_STRUPR,
# HAVE_STRCASECMP, and HAVE_STRICMP # HAVE_STRCASECMP, and HAVE_STRICMP
sc2/build/unix/config_proginfo_build
+2 -2
View File
@@ -68,7 +68,7 @@ case "$HOST_SYSTEM" in
useGccBuildTools useGccBuildTools
;; ;;
WINSCW) WINSCW)
EXTRA_WINSCW_FLAGS_COMPILE="-msgstyle gcc -gccinc -dialect c99 -relax_pointers -wchar_t off -align 4 -warnings on -w nohidevirtual,nounusedexpr -enum int -str pool -exc ms -trigraphs on -nostdinc -d _UNICODE -d __SYMBIAN32__ -d __SERIES60_30__ -d __SERIES60_3X__ -d __CW32__ -d __WINS__ -d __WINSCW__ -d __EXE__ -d __SUPPORT_CPP_EXCEPTIONS__ -I$BUILD_EPOCROOT/epoc32/include -I$BUILD_EPOCROOT/epoc32/include/stdapis -I$BUILD_EPOCROOT/epoc32/include/variant -include Symbian_OS_v9.1.hrh" EXTRA_WINSCW_FLAGS_COMPILE="-msgstyle gcc -gccinc -dialect c99 -relax_pointers -wchar_t off -align 4 -warnings on -w nohidevirtual,nounusedexpr -enum int -str pool -exc ms -trigraphs on -nostdinc -d _UNICODE -d __SYMBIAN32__ -d __SERIES60_30__ -d __SERIES60_3X__ -d __CW32__ -d __WINS__ -d __WINSCW__ -d __EXE__ -d __SUPPORT_CPP_EXCEPTIONS__ -I$BUILD_EPOCROOT/epoc32/include -I$BUILD_EPOCROOT/epoc32/include/stdapis -I$BUILD_EPOCROOT/epoc32/include/variant"
EXTRA_WINSCW_FLAGS_LINK='-library -msgstyle gcc -stdlib -noimplib -search' EXTRA_WINSCW_FLAGS_LINK='-library -msgstyle gcc -stdlib -noimplib -search'
BUILDTOOL_PREPROC_C_COMMAND="\$PROG_mwccsym2_FILE -E $EXTRA_WINSCW_FLAGS_COMPILE" BUILDTOOL_PREPROC_C_COMMAND="\$PROG_mwccsym2_FILE -E $EXTRA_WINSCW_FLAGS_COMPILE"
@@ -118,7 +118,7 @@ case "$HOST_SYSTEM" in
BUILDTOOL_LINK_DEPEND='armar' BUILDTOOL_LINK_DEPEND='armar'
;; ;;
GCCE) GCCE)
EXTRA_GCCE_FLAGS_COMPILE='-Wno-unknown-pragmas -march=armv5t -mapcs -pipe -nostdinc -msoft-float -D_UNICODE -D__GCCE__ -D__SYMBIAN32__ -D__SERIES60_30__ -D__SERIES60_3X__ -D__GCCE__ -D__EPOC32__ -D__MARM__ -D__EABI__ -D__MARM_ARMV5__ -D __REMOVE_PLATSEC_DIAGNOSTIC_STRINGS__ -D__PRODUCT_INCLUDE__=\"/epoc32/include/variant/Symbian_OS_v9.1.hrh\" -x c -include $BUILD_EPOCROOT/EPOC32/INCLUDE/GCCE/GCCE.h -I$BUILD_EPOCROOT/epoc32/include -I$BUILD_EPOCROOT/epoc32/include/stdapis -I$BUILD_EPOCROOT/epoc32/include/variant' EXTRA_GCCE_FLAGS_COMPILE='-Wno-unknown-pragmas -march=armv5t -mapcs -pipe -nostdinc -msoft-float -D_UNICODE -D__GCCE__ -D__SYMBIAN32__ -D__SERIES60_30__ -D__SERIES60_3X__ -D__GCCE__ -D__EPOC32__ -D__MARM__ -D__EABI__ -D__MARM_ARMV5__ -D __REMOVE_PLATSEC_DIAGNOSTIC_STRINGS__ -x c -include $BUILD_EPOCROOT/EPOC32/INCLUDE/GCCE/GCCE.h -I$BUILD_EPOCROOT/epoc32/include -I$BUILD_EPOCROOT/epoc32/include/stdapis -I$BUILD_EPOCROOT/epoc32/include/variant'
EXTRA_GCCE_FLAGS_LINK='' EXTRA_GCCE_FLAGS_LINK=''
BUILDTOOL_PREPROC_C_COMMAND="\$PROG_gcce_FILE -E $EXTRA_GCCE_FLAGS_COMPILE" BUILDTOOL_PREPROC_C_COMMAND="\$PROG_gcce_FILE -E $EXTRA_GCCE_FLAGS_COMPILE"
sc2/build/unix/config_proginfo_host
+1 -3
View File
@@ -282,9 +282,7 @@ case "$HOST_SYSTEM" in
LIB_pthread_VERSION="$(pthread-config --version)" LIB_pthread_VERSION="$(pthread-config --version)"
;; ;;
WINSCW|ARMV5|GCCE) WINSCW|ARMV5|GCCE)
LIB_pthread_CFLAGS="" LIB_pthread_DETECT="true"
LIB_pthread_LDFLAGS=""
LIB_pthread_VERSION=""
;; ;;
*) *)
LIB_pthread_CFLAGS="" LIB_pthread_CFLAGS=""