r3085 - in trunk: data data/gfx data/gfx/menu data/gfx/menu/default data/gfx/menu/xaw data/qcsrc/menu-div0test misc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Jan 2 12:57:30 EST 2008


Author: div0
Date: 2008-01-02 12:57:29 -0500 (Wed, 02 Jan 2008)
New Revision: 3085

Added:
   trunk/data/gfx/menu/
   trunk/data/gfx/menu/default/
   trunk/data/gfx/menu/default/background.tga
   trunk/data/gfx/menu/default/border.tga
   trunk/data/gfx/menu/default/button_c.tga
   trunk/data/gfx/menu/default/button_d.tga
   trunk/data/gfx/menu/default/button_f.tga
   trunk/data/gfx/menu/default/button_n.tga
   trunk/data/gfx/menu/default/buttongray_c.tga
   trunk/data/gfx/menu/default/buttongray_d.tga
   trunk/data/gfx/menu/default/buttongray_f.tga
   trunk/data/gfx/menu/default/buttongray_n.tga
   trunk/data/gfx/menu/default/charmap.tga
   trunk/data/gfx/menu/default/charmapbutton.tga
   trunk/data/gfx/menu/default/checkbox_c0.tga
   trunk/data/gfx/menu/default/checkbox_c1.tga
   trunk/data/gfx/menu/default/checkbox_d0.tga
   trunk/data/gfx/menu/default/checkbox_d1.tga
   trunk/data/gfx/menu/default/checkbox_f0.tga
   trunk/data/gfx/menu/default/checkbox_f1.tga
   trunk/data/gfx/menu/default/checkbox_n0.tga
   trunk/data/gfx/menu/default/checkbox_n1.tga
   trunk/data/gfx/menu/default/checkmark.tga
   trunk/data/gfx/menu/default/closebutton_c.tga
   trunk/data/gfx/menu/default/closebutton_f.tga
   trunk/data/gfx/menu/default/closebutton_n.tga
   trunk/data/gfx/menu/default/color.tga
   trunk/data/gfx/menu/default/colorbutton_c.tga
   trunk/data/gfx/menu/default/colorbutton_f.tga
   trunk/data/gfx/menu/default/colorbutton_n.tga
   trunk/data/gfx/menu/default/crosshairbutton_c.tga
   trunk/data/gfx/menu/default/crosshairbutton_f.tga
   trunk/data/gfx/menu/default/crosshairbutton_n.tga
   trunk/data/gfx/menu/default/cursor.tga
   trunk/data/gfx/menu/default/inputbox_f.tga
   trunk/data/gfx/menu/default/inputbox_n.tga
   trunk/data/gfx/menu/default/radiobutton_c0.tga
   trunk/data/gfx/menu/default/radiobutton_c1.tga
   trunk/data/gfx/menu/default/radiobutton_d0.tga
   trunk/data/gfx/menu/default/radiobutton_d1.tga
   trunk/data/gfx/menu/default/radiobutton_f0.tga
   trunk/data/gfx/menu/default/radiobutton_f1.tga
   trunk/data/gfx/menu/default/radiobutton_n0.tga
   trunk/data/gfx/menu/default/radiobutton_n1.tga
   trunk/data/gfx/menu/default/scrollbar_c.tga
   trunk/data/gfx/menu/default/scrollbar_f.tga
   trunk/data/gfx/menu/default/scrollbar_n.tga
   trunk/data/gfx/menu/default/scrollbar_s.tga
   trunk/data/gfx/menu/default/skinvalues.txt
   trunk/data/gfx/menu/default/slider_c.tga
   trunk/data/gfx/menu/default/slider_d.tga
   trunk/data/gfx/menu/default/slider_f.tga
   trunk/data/gfx/menu/default/slider_n.tga
   trunk/data/gfx/menu/default/slider_s.tga
   trunk/data/gfx/menu/xaw/
   trunk/data/gfx/menu/xaw/border.tga
   trunk/data/gfx/menu/xaw/button_c.tga
   trunk/data/gfx/menu/xaw/button_d.tga
   trunk/data/gfx/menu/xaw/button_f.tga
   trunk/data/gfx/menu/xaw/button_n.tga
   trunk/data/gfx/menu/xaw/buttongray_c.tga
   trunk/data/gfx/menu/xaw/buttongray_d.tga
   trunk/data/gfx/menu/xaw/buttongray_f.tga
   trunk/data/gfx/menu/xaw/buttongray_n.tga
   trunk/data/gfx/menu/xaw/checkbox_c0.tga
   trunk/data/gfx/menu/xaw/checkbox_c1.tga
   trunk/data/gfx/menu/xaw/checkbox_d0.tga
   trunk/data/gfx/menu/xaw/checkbox_d1.tga
   trunk/data/gfx/menu/xaw/checkbox_f0.tga
   trunk/data/gfx/menu/xaw/checkbox_f1.tga
   trunk/data/gfx/menu/xaw/checkbox_n0.tga
   trunk/data/gfx/menu/xaw/checkbox_n1.tga
   trunk/data/gfx/menu/xaw/closebutton_c.tga
   trunk/data/gfx/menu/xaw/closebutton_f.tga
   trunk/data/gfx/menu/xaw/closebutton_n.tga
   trunk/data/gfx/menu/xaw/color.tga
   trunk/data/gfx/menu/xaw/colorbutton_c.tga
   trunk/data/gfx/menu/xaw/colorbutton_f.tga
   trunk/data/gfx/menu/xaw/colorbutton_n.tga
   trunk/data/gfx/menu/xaw/cursor.tga
   trunk/data/gfx/menu/xaw/inputbox_f.tga
   trunk/data/gfx/menu/xaw/inputbox_n.tga
   trunk/data/gfx/menu/xaw/radiobutton_c0.tga
   trunk/data/gfx/menu/xaw/radiobutton_c1.tga
   trunk/data/gfx/menu/xaw/radiobutton_d0.tga
   trunk/data/gfx/menu/xaw/radiobutton_d1.tga
   trunk/data/gfx/menu/xaw/radiobutton_f0.tga
   trunk/data/gfx/menu/xaw/radiobutton_f1.tga
   trunk/data/gfx/menu/xaw/radiobutton_n0.tga
   trunk/data/gfx/menu/xaw/radiobutton_n1.tga
   trunk/data/gfx/menu/xaw/scrollbar_c.tga
   trunk/data/gfx/menu/xaw/scrollbar_f.tga
   trunk/data/gfx/menu/xaw/scrollbar_n.tga
   trunk/data/gfx/menu/xaw/scrollbar_s.tga
   trunk/data/gfx/menu/xaw/skinvalues.txt
   trunk/data/qcsrc/menu-div0test/skin-customizables.inc
Removed:
   trunk/data/qcsrc/menu-div0test/defaultskin/
   trunk/data/qcsrc/menu-div0test/xawskin/
Modified:
   trunk/data/default.cfg
   trunk/data/qcsrc/menu-div0test/menu.qc
   trunk/data/qcsrc/menu-div0test/skin.qh
   trunk/misc/makebuild.sh
Log:
skin system for menu (menu_skin cvar); allow skin defined colors


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2008-01-02 14:08:46 UTC (rev 3084)
+++ trunk/data/default.cfg	2008-01-02 17:57:29 UTC (rev 3085)
@@ -819,3 +819,5 @@
 alias _userbind_call "${$1}"
 alias +userbind "_userbind_call userbind${1}_press"
 alias -userbind "_userbind_call userbind${1}_release"
+
+seta menu_skin ""

Added: trunk/data/gfx/menu/default/background.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/background.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/border.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/border.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/button_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/button_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/button_d.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/button_d.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/button_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/button_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/button_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/button_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/buttongray_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/buttongray_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/buttongray_d.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/buttongray_d.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/buttongray_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/buttongray_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/buttongray_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/buttongray_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/charmap.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/charmap.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/charmapbutton.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/charmapbutton.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_c0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_c0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_c1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_c1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_d0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_d0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_d1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_d1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_f0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_f0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_f1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_f1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_n0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_n0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkbox_n1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkbox_n1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/checkmark.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/checkmark.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/closebutton_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/closebutton_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/closebutton_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/closebutton_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/closebutton_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/closebutton_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/color.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/color.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/colorbutton_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/colorbutton_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/colorbutton_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/colorbutton_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/colorbutton_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/colorbutton_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/crosshairbutton_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/crosshairbutton_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/crosshairbutton_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/crosshairbutton_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/crosshairbutton_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/crosshairbutton_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/cursor.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/cursor.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/inputbox_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/inputbox_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/inputbox_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/inputbox_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_c0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_c0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_c1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_c1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_d0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_d0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_d1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_d1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_f0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_f0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_f1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_f1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_n0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_n0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/radiobutton_n1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/radiobutton_n1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/scrollbar_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/scrollbar_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/scrollbar_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/scrollbar_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/scrollbar_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/scrollbar_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/scrollbar_s.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/scrollbar_s.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt	                        (rev 0)
+++ trunk/data/gfx/menu/default/skinvalues.txt	2008-01-02 17:57:29 UTC (rev 3085)
@@ -0,0 +1,45 @@
+ALPHAS_MAINMENU                 '0.6 0.8 0.9'
+ALPHA_DISABLED                  0.2
+COLOR_BUTTON_C                  '1 1 1'
+COLOR_BUTTON_D                  '1 1 1'
+COLOR_BUTTON_F                  '1 1 1'
+COLOR_BUTTON_N                  '1 1 1'
+COLOR_CHECKBOX_C                '1 1 1'
+COLOR_CHECKBOX_D                '1 1 1'
+COLOR_CHECKBOX_F                '1 1 1'
+COLOR_CHECKBOX_N                '1 1 1'
+COLOR_DIALOG_MAPINFO            '0.7 0.7 1'
+COLOR_DIALOG_MULTIPLAYER        '0.7 0.7 1'
+COLOR_DIALOG_MUTATORS           '0.7 0.7 1'
+COLOR_DIALOG_QUIT               '1 0 0'
+COLOR_DIALOG_SETTINGS           '0.7 0.7 1'
+COLOR_DIALOG_TEAMSELECT         '1 1 1'
+COLOR_DIALOG_USERBIND           '0.7 0.7 1'
+COLOR_INPUTBOX_F                '1 1 1'
+COLOR_INPUTBOX_N                '1 1 1'
+COLOR_MAPLIST_AUTHOR            '0.4 0.4 0.7'
+COLOR_MAPLIST_TITLE             '1 1 1'
+COLOR_RADIOBUTTON_C             '1 1 1'
+COLOR_RADIOBUTTON_D             '1 1 1'
+COLOR_RADIOBUTTON_F             '1 1 1'
+COLOR_RADIOBUTTON_N             '1 1 1'
+COLOR_SCROLLBAR_F               '1 1 1'
+COLOR_SCROLLBAR_N               '1 1 1'
+COLOR_SCROLLBAR_S               '1 1 1'
+COLOR_SLIDER_C                  '1 1 1'
+COLOR_SLIDER_D                  '1 1 1'
+COLOR_SLIDER_F                  '1 1 1'
+COLOR_SLIDER_N                  '1 1 1'
+COLOR_SLIDER_S                  '1 1 1'
+FONTSIZE_NORMAL                 12
+FONTSIZE_TITLE                  24
+HEIGHT_NORMAL                   1.5
+HEIGHT_TITLE                    1.5
+MARGIN_COLUMNS                  4
+MARGIN_INPUTBOX                 0.02
+MARGIN_LEFT                     8
+MARGIN_ROWS                     4
+MARGIN_TOP                      8
+TOLERANCE_SLIDER                '0.2 2 0'
+WIDTH_SCROLLBAR                 16
+WIDTH_SLIDERTEXT                0.333333333333

Added: trunk/data/gfx/menu/default/slider_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/slider_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/slider_d.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/slider_d.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/slider_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/slider_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/slider_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/slider_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/default/slider_s.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/default/slider_s.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/border.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/border.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/button_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/button_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/button_d.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/button_d.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/button_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/button_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/button_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/button_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/buttongray_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/buttongray_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/buttongray_d.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/buttongray_d.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/buttongray_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/buttongray_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/buttongray_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/buttongray_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_c0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_c0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_c1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_c1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_d0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_d0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_d1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_d1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_f0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_f0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_f1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_f1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_n0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_n0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/checkbox_n1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/checkbox_n1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/closebutton_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/closebutton_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/closebutton_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/closebutton_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/closebutton_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/closebutton_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/color.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/color.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/colorbutton_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/colorbutton_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/colorbutton_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/colorbutton_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/colorbutton_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/colorbutton_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/cursor.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/cursor.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/inputbox_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/inputbox_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/inputbox_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/inputbox_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_c0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_c0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_c1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_c1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_d0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_d0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_d1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_d1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_f0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_f0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_f1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_f1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_n0.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_n0.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/radiobutton_n1.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/radiobutton_n1.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/scrollbar_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/scrollbar_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/scrollbar_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/scrollbar_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/scrollbar_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/scrollbar_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/scrollbar_s.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/xaw/scrollbar_s.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt	                        (rev 0)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-02 17:57:29 UTC (rev 3085)
@@ -0,0 +1,45 @@
+ALPHAS_MAINMENU                 '0.6 0.8 0.9'
+ALPHA_DISABLED                  0.2
+COLOR_BUTTON_C                  '1 1 1'
+COLOR_BUTTON_D                  '1 1 1'
+COLOR_BUTTON_F                  '1 1 1'
+COLOR_BUTTON_N                  '1 1 1'
+COLOR_CHECKBOX_C                '1 1 1'
+COLOR_CHECKBOX_D                '1 1 1'
+COLOR_CHECKBOX_F                '1 1 1'
+COLOR_CHECKBOX_N                '1 1 1'
+COLOR_DIALOG_MAPINFO            '0.7 0.7 1'
+COLOR_DIALOG_MULTIPLAYER        '0.7 0.7 1'
+COLOR_DIALOG_MUTATORS           '0.7 0.7 1'
+COLOR_DIALOG_QUIT               '1 0 0'
+COLOR_DIALOG_SETTINGS           '0.7 0.7 1'
+COLOR_DIALOG_TEAMSELECT         '1 1 1'
+COLOR_DIALOG_USERBIND           '0.7 0.7 1'
+COLOR_INPUTBOX_F                '1 1 1'
+COLOR_INPUTBOX_N                '1 1 1'
+COLOR_MAPLIST_AUTHOR            '0.4 0.4 0.7'
+COLOR_MAPLIST_TITLE             '1 1 1'
+COLOR_RADIOBUTTON_C             '1 1 1'
+COLOR_RADIOBUTTON_D             '1 1 1'
+COLOR_RADIOBUTTON_F             '1 1 1'
+COLOR_RADIOBUTTON_N             '1 1 1'
+COLOR_SCROLLBAR_F               '1 1 1'
+COLOR_SCROLLBAR_N               '1 1 1'
+COLOR_SCROLLBAR_S               '1 1 1'
+COLOR_SLIDER_C                  '1 1 1'
+COLOR_SLIDER_D                  '1 1 1'
+COLOR_SLIDER_F                  '1 1 1'
+COLOR_SLIDER_N                  '1 1 1'
+COLOR_SLIDER_S                  '1 1 1'
+FONTSIZE_NORMAL                 12
+FONTSIZE_TITLE                  24
+HEIGHT_NORMAL                   1.5
+HEIGHT_TITLE                    1.5
+MARGIN_COLUMNS                  4
+MARGIN_INPUTBOX                 0.02
+MARGIN_LEFT                     8
+MARGIN_ROWS                     4
+MARGIN_TOP                      8
+TOLERANCE_SLIDER                '0.2 2 0'
+WIDTH_SCROLLBAR                 16
+WIDTH_SLIDERTEXT                0.333333333333

Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc	2008-01-02 14:08:46 UTC (rev 3084)
+++ trunk/data/qcsrc/menu-div0test/menu.qc	2008-01-02 17:57:29 UTC (rev 3085)
@@ -24,6 +24,9 @@
 
 void() m_init_delayed =
 {
+	float fh;
+	string s;
+
 	dprint_load();
 
 	menuLoadedMaplist = 0;
@@ -34,6 +37,18 @@
 
 	GameCommand_Init();
 
+	draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
+	fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
+	if(fh < 0)
+	{
+		draw_currentSkin = "gfx/menu/default";
+		fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
+	}
+	while((s = fgets(fh)))
+		if(tokenize(s) == 2)
+			Skin_ApplySetting(argv(0), argv(1));
+	fclose(fh);
+
 	if(cvar("developer") == 42)
 		draw_currentSkin = "qcsrc/menu-div0test/xawskin";
 	else

Added: trunk/data/qcsrc/menu-div0test/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin-customizables.inc	                        (rev 0)
+++ trunk/data/qcsrc/menu-div0test/skin-customizables.inc	2008-01-02 17:57:29 UTC (rev 3085)
@@ -0,0 +1,76 @@
+SKINBEGIN
+	SKINFLOAT(FONTSIZE_NORMAL, 12);
+	SKINFLOAT(HEIGHT_NORMAL, 1.5);
+
+	SKINFLOAT(FONTSIZE_TITLE, 24);
+	SKINFLOAT(HEIGHT_TITLE, 1.5);
+
+	SKINSTRING(GFX_BUTTON, "button");
+	SKINVECTOR(COLOR_BUTTON_N, '1 1 1');
+	SKINVECTOR(COLOR_BUTTON_C, '1 1 1');
+	SKINVECTOR(COLOR_BUTTON_F, '1 1 1');
+	SKINVECTOR(COLOR_BUTTON_D, '1 1 1');
+
+	SKINSTRING(GFX_BUTTON_GRAY, "buttongray");
+
+	SKINSTRING(GFX_CHECKBOX, "checkbox");
+	SKINVECTOR(COLOR_CHECKBOX_N, '1 1 1');
+	SKINVECTOR(COLOR_CHECKBOX_C, '1 1 1');
+	SKINVECTOR(COLOR_CHECKBOX_F, '1 1 1');
+	SKINVECTOR(COLOR_CHECKBOX_D, '1 1 1');
+
+	SKINSTRING(GFX_DIALOGBORDER, "border");
+	SKINSTRING(GFX_CLOSEBUTTON, "closebutton");
+	SKINFLOAT(MARGIN_TOP, 8);
+	SKINFLOAT(MARGIN_LEFT, 8);
+	SKINFLOAT(MARGIN_COLUMNS, 4);
+	SKINFLOAT(MARGIN_ROWS, 4);
+	SKINVECTOR(COLOR_DIALOG_MULTIPLAYER, '0.7 0.7 1');
+	SKINVECTOR(COLOR_DIALOG_SETTINGS, '0.7 0.7 1');
+	SKINVECTOR(COLOR_DIALOG_TEAMSELECT, '1 1 1');
+	SKINVECTOR(COLOR_DIALOG_QUIT, '1 0 0');
+	SKINVECTOR(COLOR_DIALOG_MUTATORS, '0.7 0.7 1');
+	SKINVECTOR(COLOR_DIALOG_MAPINFO, '0.7 0.7 1');
+	SKINVECTOR(COLOR_DIALOG_USERBIND, '0.7 0.7 1');
+
+	SKINSTRING(GFX_SLIDER, "slider");
+	SKINVECTOR(COLOR_SLIDER_N, '1 1 1');
+	SKINVECTOR(COLOR_SLIDER_C, '1 1 1');
+	SKINVECTOR(COLOR_SLIDER_F, '1 1 1');
+	SKINVECTOR(COLOR_SLIDER_D, '1 1 1');
+	SKINVECTOR(COLOR_SLIDER_S, '1 1 1');
+	SKINFLOAT(WIDTH_SLIDERTEXT, 0.333333333333);
+	SKINVECTOR(TOLERANCE_SLIDER, '0.2 2 0');
+
+	SKINSTRING(GFX_RADIOBUTTON, "radiobutton");
+	SKINVECTOR(COLOR_RADIOBUTTON_N, '1 1 1');
+	SKINVECTOR(COLOR_RADIOBUTTON_C, '1 1 1');
+	SKINVECTOR(COLOR_RADIOBUTTON_F, '1 1 1');
+	SKINVECTOR(COLOR_RADIOBUTTON_D, '1 1 1');
+
+	SKINSTRING(GFX_COLORBUTTON, "colorbutton");
+	SKINSTRING(GFX_COLORBUTTON_COLOR, "color");
+	SKINSTRING(GFX_CROSSHAIRBUTTON, "crosshairbutton");
+	SKINSTRING(GFX_SCROLLBAR, "scrollbar");
+	SKINVECTOR(COLOR_SCROLLBAR_N, '1 1 1');
+	SKINVECTOR(COLOR_SCROLLBAR_F, '1 1 1');
+	SKINVECTOR(COLOR_SCROLLBAR_S, '1 1 1');
+	SKINFLOAT(WIDTH_SCROLLBAR, 16);
+
+	SKINSTRING(GFX_INPUTBOX, "inputbox");
+	SKINVECTOR(COLOR_INPUTBOX_N, '1 1 1');
+	SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1');
+	SKINFLOAT(MARGIN_INPUTBOX, 0.02);
+
+	SKINVECTOR(COLOR_MAPLIST_TITLE, '1 1 1');
+	SKINVECTOR(COLOR_MAPLIST_AUTHOR, '0.4 0.4 0.7');
+
+	SKINFLOAT(ALPHA_DISABLED, 0.2);
+
+	SKINSTRING(GFX_CHARMAP, "charmap");
+	SKINSTRING(GFX_CHARMAP_SELECTED, "charmapbutton");
+
+	SKINSTRING(GFX_BACKGROUND, "background");
+
+	SKINVECTOR(ALPHAS_MAINMENU, '0.6 0.8 0.9');
+SKINEND

Modified: trunk/data/qcsrc/menu-div0test/skin.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin.qh	2008-01-02 14:08:46 UTC (rev 3084)
+++ trunk/data/qcsrc/menu-div0test/skin.qh	2008-01-02 17:57:29 UTC (rev 3085)
@@ -1,83 +1,23 @@
-const float SKINFONTSIZE_NORMAL = 12;
-const float SKINHEIGHT_NORMAL = 1.5;
-const float SKINHEIGHT_NORMAL_WITHSPACING = 2;
+#define SKINBEGIN
+#define SKINVECTOR(name,def) var vector SKIN##name = def
+#define SKINFLOAT(name,def) var float SKIN##name = def
+#define SKINSTRING(name,def) const string SKIN##name = def
+#define SKINEND
+#include "skin-customizables.inc"
+#undef SKINEND
+#undef SKINBEGIN
+#undef SKINSTRING
+#undef SKINFLOAT
+#undef SKINVECTOR
 
-const float SKINFONTSIZE_TITLE = 24;
-const float SKINHEIGHT_TITLE = 1.5;
-
-const string SKINGFX_BUTTON = "button";
-const vector SKINCOLOR_BUTTON_N = '1 1 1';
-const vector SKINCOLOR_BUTTON_C = '1 1 1';
-const vector SKINCOLOR_BUTTON_F = '1 1 1';
-const vector SKINCOLOR_BUTTON_D = '1 1 1';
-
-const string SKINGFX_BUTTON_GRAY = "buttongray";
-
-const string SKINGFX_CHECKBOX = "checkbox";
-const vector SKINCOLOR_CHECKBOX_N = '1 1 1';
-const vector SKINCOLOR_CHECKBOX_C = '1 1 1';
-const vector SKINCOLOR_CHECKBOX_F = '1 1 1';
-const vector SKINCOLOR_CHECKBOX_D = '1 1 1';
-
-const string SKINGFX_DIALOGBORDER = "border";
-const string SKINGFX_CLOSEBUTTON = "closebutton";
-const float SKINMARGIN_TOP = 8;
-const float SKINMARGIN_LEFT = 8;
-const float SKINMARGIN_COLUMNS = 4;
-const float SKINMARGIN_ROWS = 4;
-const vector SKINCOLOR_DIALOG_MULTIPLAYER = '0.7 0.7 1';
-const vector SKINCOLOR_DIALOG_SETTINGS = '0.7 0.7 1';
-const vector SKINCOLOR_DIALOG_TEAMSELECT = '1 1 1';
-const vector SKINCOLOR_DIALOG_QUIT = '1 0 0';
-const vector SKINCOLOR_DIALOG_MUTATORS = '0.7 0.7 1';
-const vector SKINCOLOR_DIALOG_MAPINFO = '0.7 0.7 1';
-const vector SKINCOLOR_DIALOG_USERBIND = '0.7 0.7 1';
-/* ideal for xaw skin:
-const vector SKINCOLOR_DIALOG_MULTIPLAYER = '1 1 1';
-const vector SKINCOLOR_DIALOG_SETTINGS = '1 1 1';
-const vector SKINCOLOR_DIALOG_TEAMSELECT = '1 1 1';
-const vector SKINCOLOR_DIALOG_QUIT = '1 1 1';
-const vector SKINCOLOR_DIALOG_MUTATORS = '1 1 1';
-const vector SKINCOLOR_DIALOG_MAPINFO = '1 1 1';
-*/
-
-const string SKINGFX_SLIDER = "slider";
-const vector SKINCOLOR_SLIDER_N = '1 1 1';
-const vector SKINCOLOR_SLIDER_C = '1 1 1';
-const vector SKINCOLOR_SLIDER_F = '1 1 1';
-const vector SKINCOLOR_SLIDER_D = '1 1 1';
-const vector SKINCOLOR_SLIDER_S = '1 1 1';
-const float SKINWIDTH_SLIDERTEXT = 0.333333333333;
-const vector SKINTOLERANCE_SLIDER = '0.2 2 0';
-
-const string SKINGFX_RADIOBUTTON = "radiobutton";
-const vector SKINCOLOR_RADIOBUTTON_N = '1 1 1';
-const vector SKINCOLOR_RADIOBUTTON_C = '1 1 1';
-const vector SKINCOLOR_RADIOBUTTON_F = '1 1 1';
-const vector SKINCOLOR_RADIOBUTTON_D = '1 1 1';
-
-const string SKINGFX_COLORBUTTON = "colorbutton";
-const string SKINGFX_COLORBUTTON_COLOR = "color";
-const string SKINGFX_CROSSHAIRBUTTON = "crosshairbutton";
-const string SKINGFX_SCROLLBAR = "scrollbar";
-const vector SKINCOLOR_SCROLLBAR_N = '1 1 1';
-const vector SKINCOLOR_SCROLLBAR_F = '1 1 1';
-const vector SKINCOLOR_SCROLLBAR_S = '1 1 1';
-const float SKINWIDTH_SCROLLBAR = 16;
-
-const string SKINGFX_INPUTBOX = "inputbox";
-const vector SKINCOLOR_INPUTBOX_N = '1 1 1';
-const vector SKINCOLOR_INPUTBOX_F = '1 1 1';
-const float SKINMARGIN_INPUTBOX = 0.02;
-
-const vector SKINCOLOR_MAPLIST_TITLE = '1 1 1';
-const vector SKINCOLOR_MAPLIST_AUTHOR = '0.4 0.4 0.7';
-
-const float SKINALPHA_DISABLED = 0.2;
-
-const string SKINGFX_CHARMAP = "charmap";
-const string SKINGFX_CHARMAP_SELECTED = "charmapbutton";
-
-const string SKINGFX_BACKGROUND = "background";
-
-const vector SKINALPHAS_MAINMENU = '0.6 0.8 0.9';
+#define SKINBEGIN void Skin_ApplySetting(string key, string value) { switch(key) {
+#define SKINVECTOR(name,def) case #name: SKIN##name = stov(value); break
+#define SKINFLOAT(name,def) case #name: SKIN##name = stof(value); break
+#define SKINSTRING(name,def) break
+#define SKINEND default: print("Invalid key in skin file: ", key, "\n"); } }
+#include "skin-customizables.inc"
+#undef SKINEND
+#undef SKINSTRING
+#undef SKINFLOAT
+#undef SKINVECTOR
+#undef SKINBEGIN

Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2008-01-02 14:08:46 UTC (rev 3084)
+++ trunk/misc/makebuild.sh	2008-01-02 17:57:29 UTC (rev 3085)
@@ -99,11 +99,11 @@
 
 build()
 {
+	buildon macmini nexuiz-osx          fteqcc-osx          /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/Library/Frameworks/SDL.framework/Headers"' strip
+		mv "$tmpdir/nexuiz-osx-agl"     "$tmpdir/Nexuiz.app/Contents/MacOS/nexuiz-osx-agl-bin"
+		mv "$tmpdir/nexuiz-osx-sdl"     "$tmpdir/Nexuiz-SDL.app/Contents/MacOS/nexuiz-osx-sdl-bin"
 	buildon hagger  nexuiz-linux-686    fteqcc-linux-686    /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=/usr/local/lib'
 	buildon hector  nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=/home/users4/ommz/polzer/libmodplug-static/lib64'
-	buildon hagger  nexuiz-osx          fteqcc-osx          /tmp/Darkplaces.build 'DP_MAKE_TARGET=macosx CC="i686-apple-darwin8-gcc -g -arch i386 -arch ppc -I/opt/mac/SDKs/MacOSX10.4u.sdk/Library/Frameworks/SDL.framework/Headers"' i686-apple-darwin8-strip
-		mv "$tmpdir/nexuiz-osx-agl"     "$tmpdir/Nexuiz.app/Contents/MacOS/nexuiz-osx-agl-bin"
-		mv "$tmpdir/nexuiz-osx-sdl"     "$tmpdir/Nexuiz-SDL.app/Contents/MacOS/nexuiz-osx-sdl-bin"
 	buildon hagger  nexuiz              fteqcc.exe          /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -I/home/polzer/mingw32.include" WINDRES=i586-mingw32msvc-windres SDL_CONFIG=/home/polzer/mingw32.SDL/bin/sdl-config' i586-mingw32msvc-strip
 }
 
@@ -202,7 +202,9 @@
 cd "$tmpdir/data/qcsrc/server"
 "$fteqccdir/fteqcc.bin" $fteqccflags
 
-rm -rf "$tmpdir/data/qcsrc"
+if [ -z "$EXPERIMENTAL" ]; then
+	rm -rf "$tmpdir/data/qcsrc"
+fi
 
 cd "$tmpdir/Docs"
 perl -pi -e '/^#---SET nexversion=([0-9.]*)$/ and $_ = "#---SET nexversion='$version'\n"' FAQ.aft




More information about the nexuiz-commits mailing list