archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 07:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename ULTDOOM/DOOM2 cpp defines to PHASE1/PHASE2

Browse source 
More self-consistent with out project, and those names dated before
Freedoom had a stronger identity.
This commit is contained in:
Mike Swanson 2019-09-01 18:49:03 -07:00
parent 9f082e5ffa
commit a31450f5b9
3 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -52,7 +52,7 @@ $(FREEDM): wadinfo_freedm.txt subdirs
# phase 1 (udoom) iwad # phase 1 (udoom) iwad
wadinfo_phase1.txt: buildcfg.txt subdirs lumps/freedoom.lmp wadinfo_phase1.txt: buildcfg.txt subdirs lumps/freedoom.lmp
$(CPP) -P -DDOOM1 -DULTDOOM < $< > $@ $(CPP) -P -DPHASE1 < $< > $@
$(FREEDOOM1): wadinfo_phase1.txt subdirs $(FREEDOOM1): wadinfo_phase1.txt subdirs
@mkdir -p $(WADS) @mkdir -p $(WADS)
@ -63,7 +63,7 @@ $(FREEDOOM1): wadinfo_phase1.txt subdirs
# phase 2 (doom2) iwad # phase 2 (doom2) iwad
wadinfo_phase2.txt: buildcfg.txt subdirs lumps/freedoom.lmp wadinfo_phase2.txt: buildcfg.txt subdirs lumps/freedoom.lmp
$(CPP) -P -DDOOM2 < $< > $@ $(CPP) -P -DPHASE2 < $< > $@
$(FREEDOOM2): wadinfo_phase2.txt subdirs $(FREEDOOM2): wadinfo_phase2.txt subdirs
@mkdir -p $(WADS) @mkdir -p $(WADS)

76
buildcfg.txt
View file

@ -1,33 +1,33 @@
; SPDX-License-Identifier: BSD-3-Clause ; SPDX-License-Identifier: BSD-3-Clause
; ;
; Freedoom wadinfo build file ; Freedoom wadinfo build file
; This is parsed by cpp which allows configuring for doom1 shareware,
; doom1, ultimate doom, and doom2
; ;
; -DDOOM2 to build for DOOM 2 ; This is parsed by cpp which allows configuring for Phase 1, Phase 2,
; -DULTDOOM to build for ultimate doom ; and FreeDM
; -DSHAREWARE to build for shareware doom ;
; -DPHASE2 to build for Phase 2
; -DPHASE1 to build for Phase 1
; ;
; sanity checks: ; sanity checks:
#ifdef FREEDM #ifdef FREEDM
#define DOOM2 #define PHASE2
#endif #endif
#ifdef DOOM2 #ifdef PHASE2
#define ULTDOOM_OR_DOOM2 #define PHASE1_OR_PHASE2
#undef ULTDOOM #undef PHASE1
#endif #endif
#ifdef ULTDOOM #ifdef PHASE1
#define ULTDOOM_OR_DOOM2 #define PHASE1_OR_PHASE2
#endif #endif
; List of levels ; List of levels
[levels] [levels]
#ifndef DOOM2 #ifndef PHASE2
E1M1 = c1m1 E1M1 = c1m1
E1M2 = c1m2 E1M2 = c1m2
E1M3 = c1m3 E1M3 = c1m3
@ -65,7 +65,7 @@ E4M7 = c4m7
E4M8 = c4m8 E4M8 = c4m8
E4M9 = c4m9 E4M9 = c4m9
#else /* #ifndef DOOM2 */ #else /* #ifndef PHASE2 */
#ifdef FREEDM #ifdef FREEDM
@ -139,7 +139,7 @@ MAP32
#endif /* #ifdef FREEDM */ #endif /* #ifdef FREEDM */
#endif /* #ifndef DOOM2 */ #endif /* #ifndef PHASE2 */
; List of data Lumps ; List of data Lumps
[lumps] [lumps]
@ -157,7 +157,7 @@ ZMAPINFO = fdmmpinf
ENDOOM = endoomdm ENDOOM = endoomdm
FREEDM FREEDM
#else #else
#ifdef ULTDOOM #ifdef PHASE1
DEHACKED = p1_deh DEHACKED = p1_deh
#else #else
DEHACKED = p2_deh DEHACKED = p2_deh
@ -165,13 +165,13 @@ DEHACKED = p2_deh
ENDOOM ENDOOM
#endif #endif
#ifdef DOOM2 #ifdef PHASE2
DMXGUSC = dmxgus DMXGUSC = dmxgus
#else #else
DMXGUS DMXGUS
#endif #endif
#ifdef DOOM2 #ifdef PHASE2
#ifdef FREEDM #ifdef FREEDM
DEMO1 = demo1_dm DEMO1 = demo1_dm
@ -185,18 +185,18 @@ DEMO3 = demo3_p2
DEMO4 = demo4_p2 DEMO4 = demo4_p2
#endif #endif
#else /* not DOOM2 */ #else /* not PHASE2 */
DEMO1 = demo1_p1 DEMO1 = demo1_p1
DEMO2 = demo2_p1 DEMO2 = demo2_p1
DEMO3 = demo3_p1 DEMO3 = demo3_p1
DEMO4 = demo4_p1 DEMO4 = demo4_p1
#endif /* #ifdef DOOM2 */ #endif /* #ifdef PHASE2 */
; Textures: ; Textures:
#ifndef DOOM2 #ifndef PHASE2
TEXTURE1 = fd1txtr1 TEXTURE1 = fd1txtr1
TEXTURE2 = fd1txtr2 TEXTURE2 = fd1txtr2
@ -287,7 +287,7 @@ DSSPIDTH
DSHOOF DSHOOF
DSMETAL DSMETAL
#ifdef DOOM2 #ifdef PHASE2
DSDSHTGN DSDSHTGN
DSDBOPN DSDBOPN
DSDBCLS DSDBCLS
@ -328,7 +328,7 @@ DSSKEACT
DSSKESIT DSSKESIT
DSSKEATK DSSKEATK
DSRADIO DSRADIO
#endif /* #ifdef DOOM2 */ #endif /* #ifdef PHASE2 */
; pc speaker effects ; pc speaker effects
@ -400,7 +400,7 @@ DPSPIDTH
DPHOOF DPHOOF
DPMETAL DPMETAL
#ifdef DOOM2 #ifdef PHASE2
DPDSHTGN DPDSHTGN
DPDBOPN DPDBOPN
DPDBCLS DPDBCLS
@ -442,13 +442,13 @@ DPSKESIT
DPSKEATK DPSKEATK
DPRADIO DPRADIO
#endif /* #ifdef DOOM2 */ #endif /* #ifdef PHASE2 */
; List of Musics ; List of Musics
[musics] [musics]
#ifndef DOOM2 #ifndef PHASE2
D_E1M1 = D_C1M1 D_E1M1 = D_C1M1
D_E1M2 = D_C1M2 D_E1M2 = D_C1M2
@ -486,7 +486,7 @@ D_E3M9 = D_C3M9
D_BUNNY D_BUNNY
#else /* #ifndef DOOM2 */ #else /* #ifndef PHASE2 */
; doom 2 music ; doom 2 music
D_READ_M D_READ_M
@ -566,12 +566,12 @@ D_EVIL = D_DM31
D_ULTIMA = D_DM32 D_ULTIMA = D_DM32
#endif /* #ifdef FREEDM */ #endif /* #ifdef FREEDM */
#endif /* #ifndef DOOM2 */ #endif /* #ifndef PHASE2 */
; List of Pictures (with insertion point) ; List of Pictures (with insertion point)
[graphics] [graphics]
#ifdef ULTDOOM #ifdef PHASE1
TITLEPIC 0 0 = fd1title TITLEPIC 0 0 = fd1title
M_DOOM 13 -16 M_DOOM 13 -16
#else #else
@ -584,10 +584,10 @@ M_DOOM 13 -16
#endif #endif
#endif #endif
#ifdef DOOM2 #ifdef PHASE2
HELP 0 0 HELP 0 0
#endif #endif
#ifndef DOOM2 #ifndef PHASE2
HELP1 0 0 = help HELP1 0 0 = help
HELP2 0 0 = credit HELP2 0 0 = credit
#endif #endif
@ -887,7 +887,7 @@ WIVCTMS 0 0
WISCRT2 0 0 WISCRT2 0 0
WIENTER 0 0 WIENTER 0 0
#ifndef DOOM2 #ifndef PHASE2
M_EPI1 0 0 M_EPI1 0 0
M_EPI2 0 0 M_EPI2 0 0
M_EPI3 0 0 M_EPI3 0 0
@ -1017,7 +1017,7 @@ WIA20500 = empty
WIA20501 = empty WIA20501 = empty
WIA20502 = empty WIA20502 = empty
#else /* #ifndef DOOM2 */ #else /* #ifndef PHASE2 */
#ifndef FREEDM #ifndef FREEDM
@ -1093,9 +1093,9 @@ CWILV31 = DMWILV31
#endif #endif
#endif /* #ifdef DOOM2 */ #endif /* #ifdef PHASE2 */
#ifdef ULTDOOM_OR_DOOM2 #ifdef PHASE1_OR_PHASE2
; interpic is used by ultimate doom and doom2 ; interpic is used by ultimate doom and doom2
INTERPIC 0 0 INTERPIC 0 0
#endif #endif
@ -1104,7 +1104,7 @@ INTERPIC 0 0
[sprites] [sprites]
#ifdef DOOM2 #ifdef PHASE2
BBRNA0 ; boss brain BBRNA0 ; boss brain
BBRNB0 BBRNB0
@ -1690,7 +1690,7 @@ VILE]6 44 109
VILE]7 44 109 VILE]7 44 109
VILE]8 44 109 VILE]8 44 109
#endif /* #ifdef DOOM2 */ #endif /* #ifdef PHASE2 */
; The following are normal Doom monsters: ; The following are normal Doom monsters:
@ -2457,7 +2457,7 @@ SMITA0 31 67
TRE1A0 25 65 TRE1A0 25 65
TRE2A0 76 120 TRE2A0 76 120
#ifdef DOOM2 #ifdef PHASE2
; These items only appear in Doom 2 ; These items only appear in Doom 2
@ -2599,7 +2599,7 @@ YSKUB0 6 17
[patches] [patches]
#ifdef DOOM1 #ifdef PHASE1
#include "lumps/textures/phase1/pnames.txt" #include "lumps/textures/phase1/pnames.txt"
#else #else
#ifdef FREEDM #ifdef FREEDM

2
scripts/simplecpp
View file

@ -16,7 +16,7 @@
# #
# #if .. #endif / #ifdef .. #endif # #if .. #endif / #ifdef .. #endif
# #
# Specify a list of options set, eg #ifdef DOOM2 || ULTDOOM || SHAREWARE # Specify a list of options set, eg #ifdef PHASE1 || PHASE2
# The block is only displayed if one of the options is set # The block is only displayed if one of the options is set
# #
# #ifn .. #endif / #ifndef .. #endif # #ifn .. #endif / #ifndef .. #endif