diff --git a/sc2/INSTALL.symbian b/sc2/INSTALL.symbian index 12010dba8..3be572199 100644 --- a/sc2/INSTALL.symbian +++ b/sc2/INSTALL.symbian @@ -20,9 +20,8 @@ Prerequisites: - Platform SDK for S60 3rd ed. * 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/ - 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 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 - UQM on actual device. + package and if device does not support FP2, Open C plugins before + attempting to run UQM on actual device. diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index 6102d21bb..3d9e98b0c 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -30,6 +30,12 @@ uqm_requirements() use_library SDL 1.2.8 || 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, # HAVE_STRCASECMP, and HAVE_STRICMP diff --git a/sc2/build/unix/config_proginfo_build b/sc2/build/unix/config_proginfo_build index 59879f05c..d8a31588d 100644 --- a/sc2/build/unix/config_proginfo_build +++ b/sc2/build/unix/config_proginfo_build @@ -68,7 +68,7 @@ case "$HOST_SYSTEM" in useGccBuildTools ;; 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' BUILDTOOL_PREPROC_C_COMMAND="\$PROG_mwccsym2_FILE -E $EXTRA_WINSCW_FLAGS_COMPILE" @@ -118,7 +118,7 @@ case "$HOST_SYSTEM" in BUILDTOOL_LINK_DEPEND='armar' ;; 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='' BUILDTOOL_PREPROC_C_COMMAND="\$PROG_gcce_FILE -E $EXTRA_GCCE_FLAGS_COMPILE" diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index 77ff87fb7..cd8219c5e 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -282,9 +282,7 @@ case "$HOST_SYSTEM" in LIB_pthread_VERSION="$(pthread-config --version)" ;; WINSCW|ARMV5|GCCE) - LIB_pthread_CFLAGS="" - LIB_pthread_LDFLAGS="" - LIB_pthread_VERSION="" + LIB_pthread_DETECT="true" ;; *) LIB_pthread_CFLAGS=""