Changeset 1024

Show
Ignore:
Timestamp:
10/10/08 00:55:09 (1 month ago)
Author:
shanoah
Message:

Install the icon direcory, and add ANGBAND_DIR_XTRA_* to variable.c, so every port doesn't have to individually assign them.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/xtra/Makefile

    r918 r1024  
    22include ../../mk/objective.mk 
    33 
    4 SUBDIRS = font graf sound 
     4SUBDIRS = font graf sound icon 
    55 
    66OBJECTIVE_DATA = \ 

  • trunk/src/externs.h

    r1020 r1024  
    209209extern char *s_text; 
    210210extern s16b spell_list[MAX_REALMS][BOOKS_PER_REALM][SPELLS_PER_BOOK]; 
     211 
    211212extern const char *ANGBAND_SYS; 
    212213extern const char *ANGBAND_GRAF; 
     214 
    213215extern char *ANGBAND_DIR; 
    214216extern char *ANGBAND_DIR_APEX; 
    …… 
    223225extern char *ANGBAND_DIR_USER; 
    224226extern char *ANGBAND_DIR_XTRA; 
     227 
     228extern char *ANGBAND_DIR_XTRA_FONT; 
     229extern char *ANGBAND_DIR_XTRA_GRAF; 
     230extern char *ANGBAND_DIR_XTRA_SOUND; 
     231extern char *ANGBAND_DIR_XTRA_HELP; 
     232extern char *ANGBAND_DIR_XTRA_ICON; 
     233 
    225234extern bool item_tester_full; 
    226235extern byte item_tester_tval; 

  • trunk/src/gtk/main-gtk.c

    r1022 r1024  
    16101610                { 
    16111611                        ANGBAND_GRAF = "old"; 
    1612                         path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA, "graf/8x8.png"); 
     1612                        path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_GRAF, "8x8.png"); 
    16131613                        use_transparency = FALSE; 
    16141614                        td->tile.w = td->tile.h = 8; 
    …… 
    16191619                { 
    16201620                        ANGBAND_GRAF = "new"; 
    1621                         path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA, "graf/16x16.png"); 
     1621                        path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_GRAF, "16x16.png"); 
    16221622                        use_transparency = TRUE; 
    16231623                        td->tile.w = td->tile.h =16; 
    …… 
    16281628                { 
    16291629                        ANGBAND_GRAF = "david"; 
    1630                         path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA, "graf/32x32.png"); 
     1630                        path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_GRAF, "32x32.png"); 
    16311631                        use_transparency = FALSE; 
    16321632                        td->tile.w = td->tile.h =32; 
    …… 
    17981798        } 
    17991799                         
    1800         path_build(logo, sizeof(logo), ANGBAND_DIR_XTRA, "icon/att-256.png"); 
     1800        path_build(logo, sizeof(logo), ANGBAND_DIR_XTRA_ICON, "att-256.png"); 
    18011801        err = gtk_window_set_default_icon_from_file(logo, NULL); 
    18021802         

  • trunk/src/init2.c

    r918 r1024  
    102102        string_free(ANGBAND_DIR_XTRA); 
    103103 
     104        string_free(ANGBAND_DIR_XTRA_FONT); 
     105        string_free(ANGBAND_DIR_XTRA_GRAF); 
     106        string_free(ANGBAND_DIR_XTRA_SOUND); 
     107        string_free(ANGBAND_DIR_XTRA_HELP); 
     108        string_free(ANGBAND_DIR_XTRA_ICON); 
    104109 
    105110        /*** Prepare the paths ***/ 
    …… 
    116121        ANGBAND_DIR_XTRA = string_make(format("%sxtra", path)); 
    117122 
    118  
     123        /* Build xtra/ paths */ 
     124        ANGBAND_DIR_XTRA_FONT = string_make(format("%s%sfont", ANGBAND_DIR_XTRA, PATH_SEP)); 
     125        ANGBAND_DIR_XTRA_GRAF = string_make(format("%s$sgraf", ANGBAND_DIR_XTRA, PATH_SEP)); 
     126        ANGBAND_DIR_XTRA_SOUND = string_make(format("%s%ssound", ANGBAND_DIR_XTRA, PATH_SEP)); 
     127        ANGBAND_DIR_XTRA_HELP = string_make(format("%s%shelp", ANGBAND_DIR_XTRA, PATH_SEP)); 
     128        ANGBAND_DIR_XTRA_ICON = string_make(format("%s%sicon", ANGBAND_DIR_XTRA, PATH_SEP)); 
     129         
    119130#ifdef PRIVATE_USER_PATH 
    120131 

  • trunk/src/main-crb.c

    r991 r1024  
    12491249        char path[2048]; 
    12501250        char buffer[2048]; 
    1251         char *ANGBAND_DIR_XTRA_SOUND; 
    12521251        ang_file *fff; 
    12531252 

  • trunk/src/main-sdl.c

    r918 r1024  
    129129static bool fullscreen = FALSE; 
    130130 
    131 /* 
    132  * Directory names 
    133  */ 
    134 static char *ANGBAND_DIR_XTRA_FONT; 
    135 static char *ANGBAND_DIR_XTRA_GRAF; 
    136  
    137131/* XXXXXXXXX */ 
    138132static char *ANGBAND_DIR_USER_SDL; 
    139  
    140 /* Later... 
    141 static cptr ANGBAND_DIR_XTRA_SOUND; 
    142 */ 
    143133 
    144134/* 

  • trunk/src/main-win.c

    r963 r1024  
    526526 */ 
    527527static cptr AngList = "AngList"; 
    528  
    529 /* 
    530  * Directory names 
    531  */ 
    532 static char *ANGBAND_DIR_XTRA_FONT; 
    533 static char *ANGBAND_DIR_XTRA_GRAF; 
    534 static char *ANGBAND_DIR_XTRA_SOUND; 
    535 static char *ANGBAND_DIR_XTRA_HELP; 
    536528 
    537529/* 

  • trunk/src/snd-sdl.c

    r918 r1024  
    3030static bool no_cache_audio = FALSE; 
    3131 
    32 /* Path to sound files */ 
    33 static const char *ANGBAND_DIR_XTRA_SOUND; 
    34  
    35  
    36  
    3732/* Arbitary limit on number of samples per event */ 
    3833#define MAX_SAMPLES      8 

  • trunk/src/variable.c

    r966 r1024  
    690690char *ANGBAND_DIR_XTRA; 
    691691 
     692/*  
     693 * Various xtra/ subdirectories. 
     694 */ 
     695char *ANGBAND_DIR_XTRA_FONT; 
     696char *ANGBAND_DIR_XTRA_GRAF; 
     697char *ANGBAND_DIR_XTRA_SOUND; 
     698char *ANGBAND_DIR_XTRA_HELP; 
     699char *ANGBAND_DIR_XTRA_ICON; 
    692700 
    693701/*