Changeset 63

Show
Ignore:
Timestamp:
04/22/07 18:45:41 (2 years ago)
Author:
takkaria
Message:

Move Windows-specific stuff into win/ (closes #15).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/Makefile.bcc

    r7 r63  
    4848 
    4949OBJ = \ 
    50   main-win.obj readdib.obj \ 
     50  main-win.obj win/readdib.obj \ 
    5151  birth.obj cave.obj cmd1.obj cmd2.obj \ 
    5252  cmd3.obj cmd4.obj cmd5.obj cmd6.obj \ 
    …… 
    8080 
    8181########################### Explicit Rules ######################## 
    82 $(EXE_FILE): $(OBJ) angband.res 
    83         $(LINKER) -aa -x $(OBJ) c0w32.obj, $(EXE_FILE),, cw32.lib import32.lib,, angband.res 
     82$(EXE_FILE): $(OBJ) win/angband.res 
     83        $(LINKER) -aa -x $(OBJ) c0w32.obj, $(EXE_FILE),, cw32.lib import32.lib,, win/angband.res 
    8484 
    85 angband.res: angband.rc 
    86         $(RC) -r angband.rc 
     85win/angband.res: win/angband.rc 
     86        $(RC) -r win/angband.rc 
    8787 
    8888 

  • trunk/src/Makefile.cyg

    r12 r63  
    1212CFLAGS = -Wall -W -pedantic -mno-cygwin -O2 -fno-strength-reduce -DWINDOWS 
    1313 
    14 EXOBJS = $(BASEOBJS) angband.res main-win.o readdib.o 
     14EXOBJS = $(BASEOBJS) win/angband.res main-win.o win/readdib.o 
    1515 
    1616# 
    …… 
    5656# 
    5757 
    58 angband.res : angband.rc 
     58win/angband.res : win/angband.rc 
    5959        $(WRES) $< -O coff -o $@ 
    6060 
    …… 
    6969# Note the additional -DNEAR= flag to cope with the 'NEAR' 
    7070# keyword used in readdib.c 
    71 readdib.o: readdib.c readdib.h 
     71win/readdib.o: win/readdib.c readdib.h 
    7272        $(CC) $(CFLAGS) -DNEAR= $(INCDIRS) -c -o $@ $< 

  • trunk/src/main-win.c

    r41 r63  
    273273 */ 
    274274#ifdef USE_GRAPHICS 
    275 # include "readdib.h" 
     275# include "win/readdib.h" 
    276276#endif /* USE_GRAPHICS */ 
    277277