From 378a405b0cded6f7496938c90f43e19089e5164d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 27 Jun 2020 20:06:44 +0100 Subject: [PATCH] CMake: Move built in GRfs to baseset dir --- media/baseset/CMakeLists.txt | 4 ++++ {bin/data => media/baseset}/innerhighlight.grf | Bin {bin/data => media/baseset}/progsignals.grf | Bin {bin/data => media/baseset}/route_step.grf | Bin {bin/data => media/baseset}/tracerestrict.grf | Bin 5 files changed, 4 insertions(+) rename {bin/data => media/baseset}/innerhighlight.grf (100%) rename {bin/data => media/baseset}/progsignals.grf (100%) rename {bin/data => media/baseset}/route_step.grf (100%) rename {bin/data => media/baseset}/tracerestrict.grf (100%) diff --git a/media/baseset/CMakeLists.txt b/media/baseset/CMakeLists.txt index c3fe34ce4e..ac11d56bf8 100644 --- a/media/baseset/CMakeLists.txt +++ b/media/baseset/CMakeLists.txt @@ -17,6 +17,10 @@ set(BASESET_OTHER_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/openttd.grf ${CMAKE_CURRENT_SOURCE_DIR}/opntitle.dat ${CMAKE_CURRENT_SOURCE_DIR}/orig_extra.grf + ${CMAKE_CURRENT_SOURCE_DIR}/innerhighlight.grf + ${CMAKE_CURRENT_SOURCE_DIR}/progsignals.grf + ${CMAKE_CURRENT_SOURCE_DIR}/route_step.grf + ${CMAKE_CURRENT_SOURCE_DIR}/tracerestrict.grf ) # Done by the subdirectories, if nforenum / grfcodec is installed diff --git a/bin/data/innerhighlight.grf b/media/baseset/innerhighlight.grf similarity index 100% rename from bin/data/innerhighlight.grf rename to media/baseset/innerhighlight.grf diff --git a/bin/data/progsignals.grf b/media/baseset/progsignals.grf similarity index 100% rename from bin/data/progsignals.grf rename to media/baseset/progsignals.grf diff --git a/bin/data/route_step.grf b/media/baseset/route_step.grf similarity index 100% rename from bin/data/route_step.grf rename to media/baseset/route_step.grf diff --git a/bin/data/tracerestrict.grf b/media/baseset/tracerestrict.grf similarity index 100% rename from bin/data/tracerestrict.grf rename to media/baseset/tracerestrict.grf