Skip to content

Commit 381550a

Browse files
committed
Remove MOD_TM (Tiberium Metamorphosis)
1 parent 64e1058 commit 381550a

File tree

16 files changed

+10
-266
lines changed

16 files changed

+10
-266
lines changed

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
type: [ TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD, MOD_SD ]
32-
#type: [ SINGLEPLAYER, TIBSUN, TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD, MOD_TM, MOD_SD ]
32+
#type: [ SINGLEPLAYER, TIBSUN, TSCLIENT, MOD_DTA, MOD_TI, MOD_TO, MOD_RUBICON, MOD_FD, MOD_SD ]
3333

3434
steps:
3535
- name: Clone Repository

Makefile

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ NFLAGS += -DMOD_FD
9999
CFLAGS += -DMOD_FD
100100
endif
101101

102-
ifdef MOD_TM
103-
$(info MOD_TM defined)
104-
NFLAGS += -DMOD_TM
105-
CFLAGS += -DMOD_TM
106-
endif
107-
108102
ifdef MOD_SD
109103
$(info MOD_SD defined)
110104
NFLAGS += -DMOD_SD
@@ -161,8 +155,8 @@ OBJS += src/IonBlastClass_crash.o
161155
OBJS += src/add_animation_to_factories_without_weaponsfactory.o
162156
OBJS += src/add_team_better.o
163157

164-
# Only include in: MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_TM
165-
ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_TM),)
158+
# Only include in: MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD
159+
ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD),)
166160
OBJS += src/ai_target_emp_like_multimissile.o
167161
endif
168162

@@ -269,8 +263,8 @@ OBJS += src/saved_games_in_subdir.o
269263
OBJS += src/savegame.o
270264
OBJS += src/scrap_metal_explosion.o
271265

272-
# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT
273-
ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
266+
# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_SD TSCLIENT
267+
ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_SD TSCLIENT),)
274268
OBJS += src/shared_control.o
275269
endif
276270

@@ -354,8 +348,8 @@ OBJS += src/max_pip_counts.o
354348
OBJS += src/mechanics.o
355349
OBJS += src/ionstorm_jumpjet_crash.o
356350

357-
# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT
358-
ifneq ($(call ifdef_any_of,MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
351+
# Only include in: MOD_TO MOD_RUBICON MOD_FD MOD_SD TSCLIENT
352+
ifneq ($(call ifdef_any_of,MOD_TO MOD_RUBICON MOD_FD MOD_SD TSCLIENT),)
359353
OBJS += src/move_team_group_number.o
360354
endif
361355

@@ -379,7 +373,7 @@ OBJS += src/chat_ignore.o
379373
OBJS += src/chatallies.o
380374

381375
# The logger is needed for certain client features
382-
ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
376+
ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_SD TSCLIENT),)
383377
OBJS += src/logger.o
384378
endif
385379

@@ -388,8 +382,8 @@ ifneq ($(call ifdef_any_of,MOD_DTA MOD_TO),)
388382
OBJS += src/remove_iscoredefender_emp_immunity.o
389383
endif
390384

391-
# Only include in: MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT
392-
ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM MOD_SD TSCLIENT),)
385+
# Only include in: MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_SD TSCLIENT
386+
ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_SD TSCLIENT),)
393387
OBJS += src/tiberium_stuff.o
394388
endif
395389

@@ -547,9 +541,6 @@ endif
547541
ifdef MOD_FD
548542
OBJS += src/fd_hacks.o
549543
endif
550-
ifdef MOD_TM
551-
OBJS += src/tm_hacks.o
552-
endif
553544
ifdef MOD_SD
554545
OBJS += src/sd_hacks.o
555546
endif
@@ -582,9 +573,6 @@ endif
582573
ifdef MOD_FD
583574
OBJS += res/fd/res.o
584575
endif
585-
ifdef MOD_TM
586-
OBJS += res/tm/res.o
587-
endif
588576
ifdef MOD_SD
589577
OBJS += res/sd/res.o
590578
endif
@@ -655,11 +643,6 @@ res/to/res.o: res/fd/res.rc
655643
$(WINDRES) $(WINDRES_FLAGS) -Ires/fd/ $< $@
656644
endif
657645

658-
ifdef MOD_TM
659-
res/to/res.o: res/tm/res.rc
660-
$(WINDRES) $(WINDRES_FLAGS) -Ires/tm/ $< $@
661-
endif
662-
663646
ifdef MOD_SD
664647
res/to/res.o: res/sd/res.rc
665648
$(WINDRES) $(WINDRES_FLAGS) -Ires/sd/ $< $@

build_tm.cmd

Lines changed: 0 additions & 39 deletions
This file was deleted.

res/tm/104.cur

-326 Bytes
Binary file not shown.

res/tm/248.cur

-766 Bytes
Binary file not shown.

res/tm/93.ico

-1.97 MB
Binary file not shown.

res/tm/cursor.rch

Lines changed: 0 additions & 1 deletion
This file was deleted.

res/tm/dialog.rch

Lines changed: 0 additions & 21 deletions
This file was deleted.

res/tm/icon.rch

Lines changed: 0 additions & 1 deletion
This file was deleted.

res/tm/menu.rch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)