From: <Mee...@us...> - 2008-08-21 18:58:50
|
Revision: 3040 http://sc2.svn.sourceforge.net/sc2/?rev=3040&view=rev Author: Meep-Eep Date: 2008-08-21 18:58:48 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Remove old code for static linking. Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2008-08-21 18:55:47 UTC (rev 3039) +++ trunk/sc2/build/unix/build.config 2008-08-21 18:58:48 UTC (rev 3040) @@ -92,7 +92,6 @@ MENU_main_ITEM_joystick_TYPE=CHOICE MENU_main_ITEM_ioformat_TYPE=CHOICE MENU_main_ITEM_accel_TYPE=CHOICE - MENU_main_ITEM_link_TYPE=CHOICE MENU_main_ITEM_install_path_TYPE=MENU CHOICE_debug_OPTIONS="nodebug debug strictdebug" @@ -291,15 +290,6 @@ } CHOICE_accel_DEFAULT=asm - # Making static binaries is more complicated than this. - # For now, it will have to be done by hand. - #CHOICE_link_OPTIONS="static dynamic" - #CHOICE_link_TITLE="Linking" - #CHOICE_link_OPTION_static_TITLE="Statically linked libraries" - #CHOICE_link_OPTION_static_ACTION='eval LDFLAGS="$LDFLAGS -static"' - #CHOICE_link_OPTION_dynamic_TITLE="Dynamically linked libraries" - #CHOICE_link_DEFAULT=dynamic - MENU_install_path_ITEMS="install_prefix install_bindir install_libdir \ install_sharedir" MENU_install_path_TITLE="Installation paths" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Mee...@us...> - 2008-08-23 11:13:04
|
Revision: 3049 http://sc2.svn.sourceforge.net/sc2/?rev=3049&view=rev Author: Meep-Eep Date: 2008-08-23 11:13:02 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Some defines for Symbian. From Gwl. Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2008-08-23 11:05:43 UTC (rev 3048) +++ trunk/sc2/build/unix/build.config 2008-08-23 11:13:02 UTC (rev 3049) @@ -100,14 +100,34 @@ CHOICE_debug_OPTION_nodebug_TITLE="Optimised release build" CHOICE_debug_OPTION_nodebug_ACTION='nodebug_action' nodebug_action() { - CFLAGS="$CFLAGS -O3" + case "$HOST_SYSTEM" in + WINSCW) + CFLAGS="$CFLAGS -O2 -d NDEBUG" + ;; + ARMV5) + CFLAGS="$CFLAGS -O3 -Otime -DNDEBUG" + ;; + *) + CFLAGS="$CFLAGS -O3" + ;; + esac DEBUG=0 } CHOICE_debug_OPTION_debug_TITLE="Debugging build" CHOICE_debug_OPTION_debug_ACTION='debug_action' debug_action() { - CFLAGS="$CFLAGS -g -O0 -W -Wall -DDEBUG" - LDFLAGS="$LDFLAGS -O0" + case "$HOST_SYSTEM" in + WINSCW) + CFLAGS="$CFLAGS -g -O0 -W all -d DEBUG -d _DEBUG" + ;; + ARMV5) + CFLAGS="$CFLAGS -g -O0 -DDEBUG -D_DEBUG" + ;; + *) + CFLAGS="$CFLAGS -g -O0 -W -Wall -DDEBUG" + LDFLAGS="$LDFLAGS -O0" + ;; + esac DEBUG=1 } CHOICE_debug_OPTION_strictdebug_TITLE="Debug + strict compile checks" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gew...@us...> - 2008-09-21 20:24:49
|
Revision: 3077 http://sc2.svn.sourceforge.net/sc2/?rev=3077&view=rev Author: gewlitys Date: 2008-09-21 20:24:45 +0000 (Sun, 21 Sep 2008) Log Message: ----------- SDL threadlib is now default also for Symbian Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2008-09-21 18:37:27 UTC (rev 3076) +++ trunk/sc2/build/unix/build.config 2008-09-21 20:24:45 UTC (rev 3077) @@ -362,14 +362,7 @@ THREADLIB="PTHREAD" use_library pthread } - case "$HOST_SYSTEM" in - ARMV5|WINSCW|GCCE) - CHOICE_threadlib_DEFAULT=pthread - ;; - *) - CHOICE_threadlib_DEFAULT=sdl - ;; - esac + CHOICE_threadlib_DEFAULT=sdl MENU_install_path_ITEMS="install_prefix install_bindir install_libdir \ install_sharedir" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gew...@us...> - 2008-10-12 22:28:59
|
Revision: 3088 http://sc2.svn.sourceforge.net/sc2/?rev=3088&view=rev Author: gewlitys Date: 2008-10-12 22:28:56 +0000 (Sun, 12 Oct 2008) Log Message: ----------- Symbian content package uses now packed anis and fonts Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2008-10-12 22:14:58 UTC (rev 3087) +++ trunk/sc2/build/unix/build.config 2008-10-12 22:28:56 UTC (rev 3088) @@ -647,15 +647,43 @@ echo "Content package already exists, skipping" return fi + + local ANIFILE ANIFILES DNAME ESC_DNAME FONTDIR FONTDIRS FONTFILES - echo "Creating content package..." + echo "Building temporary content directory..." cd content - echo "Building file list..." - find . -type f -not -path '*/CVS*' -not -path '*/.svn*' -not -path './addons*' -not -name "version" >../content.lst - echo "Zipping..." - zip -q ../content.uqm -r . -i@../content.lst + find . -type f -not -path '*/CVS*' -not -path '*/.svn*' -not -path './addons*' -not -name "version" -not -name '*.png' -not -name '*.ani' -not -name '*.sml' -not -name '*.med' -not -name '*.mid' -not -name '*.big' >../content.lst + tar cf ../tmp1.tar -T ../content.lst + rm ../content.lst + mkdir ../tmpcontent + cd ../tmpcontent + tar xf ../tmp1.tar + rm ../tmp1.tar + cd ../content + + echo "Packing ani files..." + ANIFILES=`find . -regex ".*\(sml\|med\|mid\|big\|ani\)$"` + for ANIFILE in $ANIFILES; do + DNAME=`dirname $ANIFILE`/ + ESC_DNAME=`echo $DNAME|sed "s/\//\\\\\\\\\//g"` + mkdirhier ../tmpcontent/$DNAME 0755 + zip -q -j -0 ../tmpcontent/$ANIFILE $ANIFILE `cat $ANIFILE|cut -d " " -f 1|sed s/^/$ESC_DNAME/` + done + + echo "Packing font files..." + FONTDIRS=`find . -name '*.fon'` + for FONTDIR in $FONTDIRS; do + FONTFILES=`find $FONTDIR -name '*.png'|sort -t. +2.4 -n` + zip -q -j -0 ../tmpcontent/$FONTDIR $FONTFILES + done + + cd ../tmpcontent + echo "Building content package..." + zip -q -r ../content.uqm . + cd .. - rm content.lst + echo "Removing temporary content directory..." + rm -rf tmpcontent } uqm_clean() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gew...@us...> - 2009-08-23 11:11:33
|
Revision: 3179 http://sc2.svn.sourceforge.net/sc2/?rev=3179&view=rev Author: gewlitys Date: 2009-08-23 11:11:21 +0000 (Sun, 23 Aug 2009) Log Message: ----------- Set symbian certifigate expiration date to be longer than a year. Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2009-07-26 15:59:54 UTC (rev 3178) +++ trunk/sc2/build/unix/build.config 2009-08-23 11:11:21 UTC (rev 3179) @@ -624,7 +624,7 @@ uqm_create_symbian_content_package cd src/symbian - cmd \\/C makekeys -cert -password asdfgh -len 2048 -dname "CN=UQM OR=Ur-Quan Masters CO=FI" uqm.key uqm.cer + cmd \\/C makekeys -cert -expdays 9999 -password asdfgh -len 2048 -dname "CN=UQM OR=Ur-Quan Masters CO=FI" uqm.key uqm.cer cmd \\/C makesis uqm-armv5.pkg uqm.sis cmd \\/C signsis -v uqm.sis uqm.sisx uqm.cer uqm.key asdfgh mv uqm.sisx ../.. @@ -635,7 +635,7 @@ uqm_create_symbian_content_package cd src/symbian - cmd \\/C makekeys -cert -password asdfgh -len 2048 -dname "CN=UQM OR=Ur-Quan Masters CO=FI" uqm.key uqm.cer + cmd \\/C makekeys -cert -expdays 9999 -password asdfgh -len 2048 -dname "CN=UQM OR=Ur-Quan Masters CO=FI" uqm.key uqm.cer cmd \\/C makesis uqm-gcce.pkg uqm.sis cmd \\/C signsis -v uqm.sis uqm.sisx uqm.cer uqm.key asdfgh mv uqm.sisx ../.. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Mee...@us...> - 2009-12-28 13:33:16
|
Revision: 3483 http://sc2.svn.sourceforge.net/sc2/?rev=3483&view=rev Author: Meep-Eep Date: 2009-12-28 13:33:10 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Define NDEBUG in release build. Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2009-12-28 13:12:37 UTC (rev 3482) +++ trunk/sc2/build/unix/build.config 2009-12-28 13:33:10 UTC (rev 3483) @@ -117,7 +117,7 @@ CFLAGS="$CFLAGS -O3 -DNDEBUG" ;; *) - CFLAGS="$CFLAGS -O3" + CFLAGS="$CFLAGS -O3 -DNDEBUG" ;; esac DEBUG=0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Mee...@us...> - 2010-01-23 20:13:33
|
Revision: 3508 http://sc2.svn.sourceforge.net/sc2/?rev=3508&view=rev Author: Meep-Eep Date: 2010-01-23 20:13:26 +0000 (Sat, 23 Jan 2010) Log Message: ----------- Remove -Winline from builds with strict warnings; we can't do anything about the "inlining failed in call to <...>: call is unlikely and code size would grow" warnings, and they're abscuring legitimate problems. Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2010-01-23 01:33:10 UTC (rev 3507) +++ trunk/sc2/build/unix/build.config 2010-01-23 20:13:26 UTC (rev 3508) @@ -157,7 +157,7 @@ -Wwrite-strings -Wimplicit -Wreturn-type -Wformat \ -Wswitch -Wcomment -Wchar-subscripts \ -Wparentheses -Wcast-align \ - -Winline -Wuninitialized" + -Wuninitialized" # CFLAGS="$CFLAGS -Waggregate-return" # It's not unreasonable to return structs at times. # CFLAGS="$CFLAGS "-Wpointer-arith" @@ -171,8 +171,11 @@ # on ourselves. # CFLAGS="$CFLAGS -pedantic-errors -ansi -trigraphs" # ANSI # CFLAGS="$CFLAGS -Wnested-externs" - # We know they're in the code, and though we'd like to get - # rid of them, they're not bugs. + # We know they're in the code, and though we'd like to + # get rid of them, they're not bugs. +# CFLAGS="$CFLAGS -Winline" + # This gives too many warnings which we can do nothing + # about, obscuring legitimate warnings. CFLAGS=`echo $CFLAGS` # Remove all the unnecessary spaces from $CFLAGS, # for more readable messages. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Mee...@us...> - 2010-01-25 21:43:49
|
Revision: 3524 http://sc2.svn.sourceforge.net/sc2/?rev=3524&view=rev Author: Meep-Eep Date: 2010-01-25 21:43:40 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Getting rid of GFXMODULE_SDL and SNDMODULE_SDL defines, as we don't need them any more. Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2010-01-25 21:41:09 UTC (rev 3523) +++ trunk/sc2/build/unix/build.config 2010-01-25 21:43:40 UTC (rev 3524) @@ -198,7 +198,6 @@ CHOICE_graphics_OPTION_pure_TITLE="Don't include OpenGL graphics support" CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action' graphics_pure_action() { - CFLAGS="$CFLAGS -DGFXMODULE_SDL" GFXMODULE_SDL=1 HAVE_OPENGL=0 } @@ -206,7 +205,7 @@ CHOICE_graphics_OPTION_opengl_ACTION='graphics_opengl_action' CHOICE_graphics_OPTION_opengl_PRECOND="have_library opengl" graphics_opengl_action() { - CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL" + CFLAGS="$CFLAGS -DHAVE_OPENGL" GFXMODULE_SDL=1 HAVE_OPENGL=1 use_library opengl @@ -218,14 +217,13 @@ CHOICE_sound_OPTION_mixsdl_TITLE="Use MixSDL for sound (internal)" CHOICE_sound_OPTION_mixsdl_ACTION=sound_mixsdl_action sound_mixsdl_action() { - CFLAGS="$CFLAGS -DSOUNDMODULE_SDL" SOUNDMODULE=mixsdl } CHOICE_sound_OPTION_openal_TITLE="Include OpenAL support (experimental)" CHOICE_sound_OPTION_openal_PRECOND="have_library openal" CHOICE_sound_OPTION_openal_ACTION=sound_openal_action sound_openal_action() { - CFLAGS="$CFLAGS -DHAVE_OPENAL -DSOUNDMODULE_SDL" + CFLAGS="$CFLAGS -DHAVE_OPENAL" SOUNDMODULE=openal use_library openal } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2011-09-06 21:20:47
|
Revision: 3687 http://sc2.svn.sourceforge.net/sc2/?rev=3687&view=rev Author: avolkov Date: 2011-09-06 21:20:40 +0000 (Tue, 06 Sep 2011) Log Message: ----------- Added -Wdeclaration-after-statement to strict warnings build; removed -O1 not needed for gcc 4; from Scott A. Colcord Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2011-09-06 17:33:18 UTC (rev 3686) +++ trunk/sc2/build/unix/build.config 2011-09-06 21:20:40 UTC (rev 3687) @@ -150,14 +150,17 @@ CFLAGS="$CFLAGS -g -O0 -DDEBUG -D_DEBUG" ;; *) - CFLAGS="$CFLAGS -O1" # This is needed for -Wunitialized - CFLAGS="$CFLAGS -g -DDEBUG -W -Wall \ - -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \ + CFLAGS="$CFLAGS -g -DDEBUG -W -Wall" +# CFLAGS="$CFLAGS -O1" + # This is needed for -Wunitialized with gcc 3.4 + CFLAGS="$CFLAGS -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \ -Wstrict-prototypes -Wmissing-declarations \ -Wwrite-strings -Wimplicit -Wreturn-type -Wformat \ -Wswitch -Wcomment -Wchar-subscripts \ -Wparentheses -Wcast-align \ -Wuninitialized" + CFLAGS="$CFLAGS -Wdeclaration-after-statement" + # Until we abandon MSVC 6 # CFLAGS="$CFLAGS -Waggregate-return" # It's not unreasonable to return structs at times. # CFLAGS="$CFLAGS "-Wpointer-arith" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <av...@us...> - 2011-09-07 01:01:18
|
Revision: 3689 http://sc2.svn.sourceforge.net/sc2/?rev=3689&view=rev Author: avolkov Date: 2011-09-07 01:01:12 +0000 (Wed, 07 Sep 2011) Log Message: ----------- Add -O0 to strict debug build type to match others Modified Paths: -------------- trunk/sc2/build/unix/build.config Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2011-09-06 22:14:20 UTC (rev 3688) +++ trunk/sc2/build/unix/build.config 2011-09-07 01:01:12 UTC (rev 3689) @@ -150,7 +150,7 @@ CFLAGS="$CFLAGS -g -O0 -DDEBUG -D_DEBUG" ;; *) - CFLAGS="$CFLAGS -g -DDEBUG -W -Wall" + CFLAGS="$CFLAGS -g -O0 -DDEBUG -W -Wall" # CFLAGS="$CFLAGS -O1" # This is needed for -Wunitialized with gcc 3.4 CFLAGS="$CFLAGS -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |