fiddlerwoaroof/crawl - Change TFUIWOKE42ZQ4ABAAJM4M3NT4QR3GMNQLJVJLH3JGH4MK7C5RYDAC

win32: eliminate need for WIN32TILES/WIN32CONSOLE macros

Instead of defined(WIN32CONSOLE) we should use: defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)

As well as replace defined(WIN32TILES) with: defined(TARGET_OS_WINDOWS) && defined(USE_TILE)

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by Steven Noonan on October 19, 2009

TFUIWOKE42ZQ4ABAAJM4M3NT4QR3GMNQLJVJLH3JGH4MK7C5RYDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 199 [7.13254]

B:BD[6.1288] → [3.5:78]

#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS) || defined(USE_TILE)

[6.1288]

[6.1330]

#if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS) || defined(USE_TILE)

Replacement in crawl-ref/source/view.cc at line 322 [7.16817]

B:BD[8.152] → [3.102:175]

#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS) || defined(USE_TILE)

[8.152]

[9.673]

#if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS) || defined(USE_TILE)

Replacement in crawl-ref/source/view.cc at line 358 [7.16817]

B:BD[7.30913] → [3.176:249]

#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS) || defined(USE_TILE)

[7.30913]

[6.6169]

#if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS) || defined(USE_TILE)

Replacement in crawl-ref/source/view.cc at line 599 [7.16817]

B:BD[10.223] → [3.250:323]

#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS) || defined(USE_TILE)

[10.223]

[9.1530]

#if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS) || defined(USE_TILE)

Replacement in crawl-ref/source/tilesdl.cc at line 120 [12.19415]
B:BD[11.288] → [11.288:306]
```
#ifdef WIN32TILES
```
[11.288]
[11.306]
```
#ifdef TARGET_OS_WINDOWS
```
Replacement in crawl-ref/source/tilesdl.cc at line 137 [12.19415]
B:BD[11.710] → [11.710:728]
```
#ifdef WIN32TILES
```
[11.710]
[11.728]
```
#ifdef TARGET_OS_WINDOWS
```
Replacement in crawl-ref/source/tilesdl.cc at line 230 [12.19415]
B:BD[12.21877] → [13.236:254]
```
#ifdef WIN32TILES
```
[12.21877]
[13.254]
```
#ifdef TARGET_OS_WINDOWS
```
Replacement in crawl-ref/source/tilesdl.cc at line 257 [12.19415]
∅:D[14.319] → [15.236:254]
B:BD[12.22097] → [15.236:254]
```
#ifdef WIN32TILES
```
[14.319]
[14.320]
```
#ifdef TARGET_OS_WINDOWS
```
Replacement in crawl-ref/source/stuff.cc at line 752 [7.224557]
B:BD[7.231075] → [16.154:174]
```
#ifdef WIN32CONSOLE
```
[7.231075]
[16.174]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```
Replacement in crawl-ref/source/stuff.cc at line 785 [7.224557]
B:BD[7.231183] → [7.231183:231203]
```
#ifdef WIN32CONSOLE
```
[7.231183]
[7.231203]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```

Replacement in crawl-ref/source/stuff.cc at line 829 [7.224557]

B:BD[17.29] → [3.673:759]

#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS) || defined(DGL_PAUSE_AFTER_ERROR)

[17.29]

[18.1976]

#if (defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)) || \
     defined(TARGET_OS_DOS) || \
     defined(DGL_PAUSE_AFTER_ERROR)

Replacement in crawl-ref/source/newgame.cc at line 3323 [7.1132300]

B:BD[7.1186535] → [3.3723:3798]

#if defined(TARGET_OS_DOS) || defined(WIN32CONSOLE) || defined(WIN32TILES)

[7.1186535]

[19.19698]

#if defined(TARGET_OS_DOS) || defined(TARGET_OS_WINDOWS)

Replacement in crawl-ref/source/menu.cc at line 1323 [20.261322]

B:BD[6.572097] → [3.3980:4032]

#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS)

[6.572097]

[6.572139]

#if (defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)) || defined(TARGET_OS_DOS)

Deletion in crawl-ref/source/makefile at line 461 [7.2455714]
B:BD[5.4749] → [5.4749:4755]
∅:D[5.4755] → [21.11510:11517]
B:BD[21.11510] → [21.11510:11517]
B:BD[21.11517] → [5.4756:4780]
∅:D[5.4780] → [22.3024:3051]
B:BD[21.11559] → [22.3024:3051]
∅:D[22.3051] → [21.11584:11589]
B:BD[21.11584] → [21.11584:11589]
B:BD[21.11589] → [22.3052:3081]
```
endif
endif
ifdef WIN32
ifdef TILES
CFOTHERS_L += -DWIN32TILES
else
CFOTHERS_L += -DWIN32CONSOLE
```
Replacement in crawl-ref/source/libw32c.cc at line 3 [7.2476860]
∅:D[23.4165] → [24.48908:48934]
B:BD[7.2476860] → [24.48908:48934]
```
#if defined(WIN32CONSOLE)
```
[23.4165]
[24.48934]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```
Replacement in crawl-ref/source/libw32c.cc at line 1161 [7.2476860]
∅:D[23.6421] → [24.48937:48976]
B:BD[24.48937] → [24.48937:48976]
```
#endif /* #if defined(WIN32CONSOLE) */
```
[23.6421]
```
#endif /* #if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) */
```
Replacement in crawl-ref/source/libutil.cc at line 21 [7.2494093]
B:BD[20.324310] → [25.5789057:5789106]
```
#if defined(WIN32CONSOLE) || defined(WIN32TILES)
```
[20.324310]
[26.6491]
```
#ifdef TARGET_OS_WINDOWS
```

Replacement in crawl-ref/source/libutil.cc at line 33 [7.2494093]

B:BD[20.324491] → [3.4149:4228]

    #if defined(WIN32CONSOLE) || defined(WIN32TILES) || defined(TARGET_OS_DOS)

[20.324491]

[20.324515]

    #if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS)

Replacement in crawl-ref/source/libutil.cc at line 164 [7.2494093]
B:BD[2.3344] → [2.3344:3395]
```
#elif defined(WIN32CONSOLE) || defined(WIN32TILES)
```
[2.3344]
[2.3395]
```
#elif defined(TARGET_OS_WINDOWS)
```
Replacement in crawl-ref/source/initfile.cc at line 45 [7.2957258]
B:BD[4.3560] → [4.3560:3615]
```
#if defined ( WIN32CONSOLE ) || defined ( WIN32TILES )
```
[4.3560]
[4.3615]
```
#ifdef TARGET_OS_WINDOWS
```
Replacement in crawl-ref/source/files.cc at line 305 [7.3084589]
B:BD[27.11606] → [27.11606:11655]
```
#if defined(WIN32CONSOLE) || defined(WIN32TILES)
```
[27.11606]
[27.11655]
```
#ifdef TARGET_OS_WINDOWS
```
Replacement in crawl-ref/source/cio.cc at line 153 [28.15671]
B:BD[28.18427] → [28.18427:18455]
```
#elif defined(WIN32CONSOLE)
```
[28.18427]
[28.18455]
```
#elif defined(TARGET_OS_WINDOWS)
```

Replacement in crawl-ref/source/cio.cc at line 188 [28.15671]

B:BD[28.19210] → [3.5788:5857]

#if defined(TARGET_OS_DOS) || defined(UNIX) || defined(WIN32CONSOLE)

[28.19210]

[28.19269]

#if defined(TARGET_OS_DOS) || defined(UNIX) || (defined(TARGET_OS_WINDOWS) && !defined(USE_TILE))

Replacement in crawl-ref/source/beam.cc at line 2084 [7.4128068]
B:BD[7.4178109] → [29.20855:20875]
```
#ifdef WIN32CONSOLE
```
[7.4178109]
[29.20875]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```
Replacement in crawl-ref/source/beam.cc at line 2196 [7.4128068]
∅:D[30.9146] → [7.4179377:4179397]
B:BD[7.4179377] → [7.4179377:4179397]
```
#ifdef WIN32CONSOLE
```
[30.9146]
[29.22730]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```
Replacement in crawl-ref/source/beam.cc at line 5521 [7.4128068]
B:BD[7.4254773] → [7.4254773:4254793]
```
#ifdef WIN32CONSOLE
```
[7.4254747]
[29.68873]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```
Replacement in crawl-ref/source/beam.cc at line 5586 [7.4128068]
B:BD[7.4256327] → [7.4256327:4256347]
```
#ifdef WIN32CONSOLE
```
[7.4256327]
[29.70259]
```
#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
```
Replacement in crawl-ref/source/MSVC/Tiles.vsprops at line 10 [32.44342]
∅:D[31.22148] → [32.44665:44714]
B:BD[32.44665] → [32.44665:44714]
```
		PreprocessorDefinitions="WIN32TILES;USE_TILE"
```
[31.22148]
[32.44714]
```
		PreprocessorDefinitions="USE_TILE"
```
Replacement in crawl-ref/source/MSVC/Console.vsprops at line 9 [33.40126]
B:BD[33.40294] → [33.40294:40335]
```
		PreprocessorDefinitions="WIN32CONSOLE"
```
[33.40294]
[33.40335]
```
		PreprocessorDefinitions=""
```
Replacement in crawl-ref/source/AppHdr.h at line 202 [7.4573713]
∅:D[3.6685] → [25.5939389:5939419]
B:BD[25.5939389] → [25.5939389:5939419]
```
    #if defined(WIN32CONSOLE)
```
[3.6685]
[25.5939419]
```
    #if !defined(USE_TILE)
```

win32: eliminate need for WIN32TILES/WIN32CONSOLE macros

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 199 [7.13254]

Replacement in crawl-ref/source/view.cc at line 322 [7.16817]

Replacement in crawl-ref/source/view.cc at line 358 [7.16817]

Replacement in crawl-ref/source/view.cc at line 599 [7.16817]

Replacement in crawl-ref/source/tilesdl.cc at line 120 [12.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 137 [12.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 230 [12.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 257 [12.19415]

Replacement in crawl-ref/source/stuff.cc at line 752 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 785 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 829 [7.224557]

Replacement in crawl-ref/source/newgame.cc at line 3323 [7.1132300]

Replacement in crawl-ref/source/menu.cc at line 1323 [20.261322]

Deletion in crawl-ref/source/makefile at line 461 [7.2455714]

Replacement in crawl-ref/source/libw32c.cc at line 3 [7.2476860]

Replacement in crawl-ref/source/libw32c.cc at line 1161 [7.2476860]

Replacement in crawl-ref/source/libutil.cc at line 21 [7.2494093]

Replacement in crawl-ref/source/libutil.cc at line 33 [7.2494093]

Replacement in crawl-ref/source/libutil.cc at line 164 [7.2494093]

Replacement in crawl-ref/source/initfile.cc at line 45 [7.2957258]

Replacement in crawl-ref/source/files.cc at line 305 [7.3084589]

Replacement in crawl-ref/source/cio.cc at line 153 [28.15671]

Replacement in crawl-ref/source/cio.cc at line 188 [28.15671]

Replacement in crawl-ref/source/beam.cc at line 2084 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 2196 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 5521 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 5586 [7.4128068]

Replacement in crawl-ref/source/MSVC/Tiles.vsprops at line 10 [32.44342]

Replacement in crawl-ref/source/MSVC/Console.vsprops at line 9 [33.40126]

Replacement in crawl-ref/source/AppHdr.h at line 202 [7.4573713]