Skip to content

Commit

Permalink
Disable 3 tiberium-related patches for Vinifera builds
Browse files Browse the repository at this point in the history
- tiberium_stuff
- tiberium4_blocks_infantry
- tiberium_damage
  • Loading branch information
Bittah committed Sep 26, 2024
1 parent c66eea3 commit c831887
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,6 @@ OBJS += src/unit_self_heal_repair_step.o
OBJS += src/text_triggers.o
OBJS += src/tiberium_on_slope_crash.o

# Only include in: MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT
ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
OBJS += src/tiberium_stuff.o
endif

OBJS += src/tiberium4_blocks_infantry.o
OBJS += src/tileset255_bridgerepairfix.o
OBJS += src/trigger_actions_extended.o
OBJS += src/ts_util.o
Expand All @@ -302,11 +296,6 @@ OBJS += src/wcsncpy.o
OBJS += src/whiteboy_cameo_bugfix.o
OBJS += src/basic_theme_fix.o

# Sources included in mods but NOT the client.
ifndef TSCLIENT
OBJS += src/tiberium_damage.o
endif

# Only include in: MOD_DTA MOD_FD
ifneq ($(call ifdef_any_of,MOD_DTA MOD_FD),)
OBJS += src/vehicle_transports.o
Expand Down Expand Up @@ -392,6 +381,18 @@ ifneq ($(call ifdef_any_of,MOD_DTA MOD_TO),)
OBJS += src/remove_iscoredefender_emp_immunity.o
endif

# Only include in: MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT
ifneq ($(call ifdef_any_of,MOD_TO MOD_TI MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
OBJS += src/tiberium_stuff.o
endif

OBJS += src/tiberium4_blocks_infantry.o

# Sources included in mods but NOT the client.
ifndef TSCLIENT
OBJS += src/tiberium_damage.o
endif

OBJS += src/rules_process.o
OBJS += src/scale_movie_fix.o
OBJS += src/scale_movie_fix_hack.o
Expand Down

0 comments on commit c831887

Please sign in to comment.