From e6f62ee5ed18088cda98c3a7c7537e3b3cb3e1c8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 9 May 2023 06:55:09 +0300 Subject: [PATCH 20/20] Move windows icons to platforms/windows/icons/ See osdn #48001 Signed-off-by: Marko Lindqvist --- client/Makefile.am | 2 +- configure.ac | 2 ++ meson.build | 8 ++--- platforms/Makefile.am | 2 ++ platforms/windows/.gitignore | 2 ++ platforms/windows/Makefile.am | 3 ++ platforms/windows/icons/.gitignore | 2 ++ platforms/windows/icons/Makefile.am | 33 ++++++++++++++++++ .../windows/icons}/client.ico | Bin .../windows/icons}/clienticon.rc | 0 {windows => platforms/windows/icons}/mp.ico | Bin .../windows/icons}/mpicon.rc | 0 .../windows/icons}/ruledit.ico | Bin .../windows/icons}/rulediticon.rc | 0 .../windows/icons}/server.ico | Bin .../windows/icons}/servericon.rc | 0 server/Makefile.am | 2 +- tools/fcmp/Makefile.am | 2 +- tools/ruledit/Makefile.am | 2 +- windows/Makefile.am | 28 --------------- 20 files changed, 52 insertions(+), 36 deletions(-) create mode 100644 platforms/windows/.gitignore create mode 100644 platforms/windows/Makefile.am create mode 100644 platforms/windows/icons/.gitignore create mode 100644 platforms/windows/icons/Makefile.am rename {windows => platforms/windows/icons}/client.ico (100%) rename {windows => platforms/windows/icons}/clienticon.rc (100%) rename {windows => platforms/windows/icons}/mp.ico (100%) rename {windows => platforms/windows/icons}/mpicon.rc (100%) rename {windows => platforms/windows/icons}/ruledit.ico (100%) rename {windows => platforms/windows/icons}/rulediticon.rc (100%) rename {windows => platforms/windows/icons}/server.ico (100%) rename {windows => platforms/windows/icons}/servericon.rc (100%) diff --git a/client/Makefile.am b/client/Makefile.am index 781e70aa41..1e45f86e3f 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -30,7 +30,7 @@ AUDIO_SDL_FILES = $(ALL_AUDIO_SDL_FILES) endif if MINGW -CLIENTICON = ../windows/clienticon.o +CLIENTICON = $(top_builddir)/platforms/windows/icons/clienticon.o endif EXTRA_DIST= $(ALL_AUDIO_SDL_FILES) diff --git a/configure.ac b/configure.ac index 50689b3eee..3cd8e8e9a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1970,6 +1970,8 @@ AC_CONFIG_FILES([Makefile ai/tex/Makefile tests/Makefile platforms/Makefile + platforms/windows/Makefile + platforms/windows/icons/Makefile windows/Makefile client/Makefile client/agents/Makefile diff --git a/meson.build b/meson.build index be2698bb17..ed4d35cbef 100644 --- a/meson.build +++ b/meson.build @@ -950,10 +950,10 @@ if host_system == 'windows' '-i', '@INPUT@', '-o', '@OUTPUT@'], output: '@BASENAME@.o') - clienticon = windres.process('windows/clienticon.rc') - mpicon = windres.process('windows/mpicon.rc') - rulediticon = windres.process('windows/rulediticon.rc') - servericon = windres.process('windows/servericon.rc') + clienticon = windres.process('platforms/windows/icons/clienticon.rc') + mpicon = windres.process('platforms/windows/icons/mpicon.rc') + rulediticon = windres.process('platforms/windows/icons/rulediticon.rc') + servericon = windres.process('platforms/windows/icons/servericon.rc') else clienticon = [] mpicon = [] diff --git a/platforms/Makefile.am b/platforms/Makefile.am index f9a7b80b4f..2bdf170ad3 100644 --- a/platforms/Makefile.am +++ b/platforms/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +SUBDIRS = windows + EXTRA_DIST = \ emscripten/emsbuild.sh \ emscripten/setups/cross-ems.tmpl \ diff --git a/platforms/windows/.gitignore b/platforms/windows/.gitignore new file mode 100644 index 0000000000..9ee6454019 --- /dev/null +++ b/platforms/windows/.gitignore @@ -0,0 +1,2 @@ +/Makefile.in +/Makefile diff --git a/platforms/windows/Makefile.am b/platforms/windows/Makefile.am new file mode 100644 index 0000000000..99d43e0a1a --- /dev/null +++ b/platforms/windows/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = icons diff --git a/platforms/windows/icons/.gitignore b/platforms/windows/icons/.gitignore new file mode 100644 index 0000000000..9ee6454019 --- /dev/null +++ b/platforms/windows/icons/.gitignore @@ -0,0 +1,2 @@ +/Makefile.in +/Makefile diff --git a/platforms/windows/icons/Makefile.am b/platforms/windows/icons/Makefile.am new file mode 100644 index 0000000000..c2a224f826 --- /dev/null +++ b/platforms/windows/icons/Makefile.am @@ -0,0 +1,33 @@ +## Process this file with automake to produce Makefile.in + +dist_noinst_DATA = \ + client.ico \ + mp.ico \ + ruledit.ico \ + server.ico \ + clienticon.rc \ + mpicon.rc \ + rulediticon.rc \ + servericon.rc + +if MINGW +nodist_noinst_DATA = \ + clienticon.o \ + mpicon.o \ + rulediticon.o \ + servericon.o + +CLEANFILES = $(nodist_noinst_DATA) + +clienticon.o: clienticon.rc + $(WINDRES) -I$(srcdir) -i $(srcdir)/clienticon.rc -o clienticon.o + +mpicon.o: mpicon.rc + $(WINDRES) -I$(srcdir) -i $(srcdir)/mpicon.rc -o mpicon.o + +rulediticon.o: rulediticon.rc + $(WINDRES) -I$(srcdir) -i $(srcdir)/rulediticon.rc -o rulediticon.o + +servericon.o: servericon.rc + $(WINDRES) -I$(srcdir) -i $(srcdir)/servericon.rc -o servericon.o +endif diff --git a/windows/client.ico b/platforms/windows/icons/client.ico similarity index 100% rename from windows/client.ico rename to platforms/windows/icons/client.ico diff --git a/windows/clienticon.rc b/platforms/windows/icons/clienticon.rc similarity index 100% rename from windows/clienticon.rc rename to platforms/windows/icons/clienticon.rc diff --git a/windows/mp.ico b/platforms/windows/icons/mp.ico similarity index 100% rename from windows/mp.ico rename to platforms/windows/icons/mp.ico diff --git a/windows/mpicon.rc b/platforms/windows/icons/mpicon.rc similarity index 100% rename from windows/mpicon.rc rename to platforms/windows/icons/mpicon.rc diff --git a/windows/ruledit.ico b/platforms/windows/icons/ruledit.ico similarity index 100% rename from windows/ruledit.ico rename to platforms/windows/icons/ruledit.ico diff --git a/windows/rulediticon.rc b/platforms/windows/icons/rulediticon.rc similarity index 100% rename from windows/rulediticon.rc rename to platforms/windows/icons/rulediticon.rc diff --git a/windows/server.ico b/platforms/windows/icons/server.ico similarity index 100% rename from windows/server.ico rename to platforms/windows/icons/server.ico diff --git a/windows/servericon.rc b/platforms/windows/icons/servericon.rc similarity index 100% rename from windows/servericon.rc rename to platforms/windows/icons/servericon.rc diff --git a/server/Makefile.am b/server/Makefile.am index 0080912783..293f4b68cd 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -30,7 +30,7 @@ AM_CPPFLAGS = \ $(FCDB_MYSQL_CFLAGS) $(FCDB_POSTGRES_CFLAGS) $(FCDB_SQLITE3_CFLAGS) if MINGW -SERVERICON=../windows/servericon.o +SERVERICON = $(top_builddir)/platforms/windows/icons/servericon.o endif exe_sources = \ diff --git a/tools/fcmp/Makefile.am b/tools/fcmp/Makefile.am index 9a5de8b5f7..cc7f129377 100644 --- a/tools/fcmp/Makefile.am +++ b/tools/fcmp/Makefile.am @@ -38,7 +38,7 @@ common_cppflags = \ AM_CPPFLAGS = $(common_cppflags) if MINGW -MPICON = $(top_builddir)/windows/mpicon.o +MPICON = $(top_builddir)/platforms/windows/icons/mpicon.o endif libfcmp_la_SOURCES = \ diff --git a/tools/ruledit/Makefile.am b/tools/ruledit/Makefile.am index 0e33207eaa..2ef6998ff0 100644 --- a/tools/ruledit/Makefile.am +++ b/tools/ruledit/Makefile.am @@ -5,7 +5,7 @@ MOCCMD=@MOCCMD@ include $(top_srcdir)/bootstrap/Makerules.mk if MINGW -REICON = $(top_builddir)/windows/rulediticon.o +REICON = $(top_builddir)/platforms/windows/icons/rulediticon.o endif bin_PROGRAMS = freeciv-ruledit diff --git a/windows/Makefile.am b/windows/Makefile.am index 4c7e67df2b..28ce5d6bba 100644 --- a/windows/Makefile.am +++ b/windows/Makefile.am @@ -1,14 +1,6 @@ ## Process this file with automake to produce Makefile.in dist_noinst_DATA = \ - client.ico \ - mp.ico \ - ruledit.ico \ - server.ico \ - clienticon.rc \ - mpicon.rc \ - rulediticon.rc \ - servericon.rc \ installer_msys2/licenses/header.txt \ installer_msys2/create-freeciv-gtk-qt-nsi.sh \ installer_msys2/create-freeciv-gtk3.22-nsi.sh \ @@ -57,24 +49,4 @@ dist_noinst_DATA = \ installer_cross/setups/cross-win32.tmpl \ installer_cross/setups/cross-win64.tmpl -if MINGW -nodist_noinst_DATA = \ - clienticon.o \ - mpicon.o \ - rulediticon.o \ - servericon.o - CLEANFILES = $(nodist_noinst_DATA) - -clienticon.o: clienticon.rc - $(WINDRES) -I$(srcdir) -i $(srcdir)/clienticon.rc -o clienticon.o - -mpicon.o: mpicon.rc - $(WINDRES) -I$(srcdir) -i $(srcdir)/mpicon.rc -o mpicon.o - -rulediticon.o: rulediticon.rc - $(WINDRES) -I$(srcdir) -i $(srcdir)/rulediticon.rc -o rulediticon.o - -servericon.o: servericon.rc - $(WINDRES) -I$(srcdir) -i $(srcdir)/servericon.rc -o servericon.o -endif -- 2.39.2