comparison Makefile.am @ 269:3efac0541151

chore: merge
author Paper <paper@paper.us.eu.org>
date Fri, 12 Apr 2024 05:23:45 -0400
parents 09c5bd74fe93
children ec0a2b5493f8 657fda1b9cac
comparison
equal deleted inserted replaced
268:382b50754fe4 269:3efac0541151
97 files_win = src/sys/win32/dark_theme.cc 97 files_win = src/sys/win32/dark_theme.cc
98 libs_win = -lole32 -luuid 98 libs_win = -lole32 -luuid
99 ldflags_win = -mwindows 99 ldflags_win = -mwindows
100 100
101 # Add dark stylesheet to resources 101 # Add dark stylesheet to resources
102 qtrc_win = $(top_srcdir)/rc/win32/dark/dark.qrc 102 minori_qtrc_win = $(top_srcdir)/rc/sys/win32/dark/dark.qrc
103 103
104 if BUILD_WINDRES 104 if BUILD_WINDRES
105 105
106 wrcflags_version = -DWRC_VERSION=0,`echo $(PACKAGE_VERSION) | @SED@ 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1,\2,\3/'` 106 wrcflags_version = -DWRC_VERSION=0,`echo $(PACKAGE_VERSION) | @SED@ 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1,\2,\3/'`
107 107
230 $(files_glib) \ 230 $(files_glib) \
231 $(files_win) \ 231 $(files_win) \
232 $(files_windres) \ 232 $(files_windres) \
233 $(minori_locale_ts) \ 233 $(minori_locale_ts) \
234 $(minori_qtrc) \ 234 $(minori_qtrc) \
235 $(minori_qtrc_win) \
235 $(minori_locale_qm) \ 236 $(minori_locale_qm) \
236 $(minori_moc_sources) \ 237 $(minori_moc_sources) \
237 $(minori_utf8proc_sources) \ 238 $(minori_utf8proc_sources) \
238 rc/locale/translations.qrc \ 239 rc/locale/translations.qrc \
239 rc/final_qrc.cc 240 rc/final_qrc.cc
255 minori_DEPENDENCIES = dep/pugixml/libpugixml.la dep/animone/libanimone.la dep/anitomy/libanitomy.la 256 minori_DEPENDENCIES = dep/pugixml/libpugixml.la dep/animone/libanimone.la dep/anitomy/libanitomy.la
256 minori_LDADD = $(minori_DEPENDENCIES) $(libs_glib) $(LIBCURL) $(QT_LIBS) $(libs_osx) $(libs_win) 257 minori_LDADD = $(minori_DEPENDENCIES) $(libs_glib) $(LIBCURL) $(QT_LIBS) $(libs_osx) $(libs_win)
257 258
258 # Build only one qrc, otherwise we get a ton of 259 # Build only one qrc, otherwise we get a ton of
259 # weird linking errors 260 # weird linking errors
260 rc/final_qrc.cc: $(minori_qtrc) 261 rc/final_qrc.cc: $(minori_qtrc) $(minori_qtrc_win)
261 $(QT_RCC) -o $@ $(minori_qtrc) 262 $(QT_RCC) -o $@ $(minori_qtrc) $(minori_qtrc_win)
262 263
263 .h_moc.cc: 264 .h_moc.cc:
264 $(MKDIR_P) -- $$(dirname $@) 265 $(MKDIR_P) -- $$(dirname $@)
265 $(QT_MOC) -o $@ $(minori_includes) $< 266 $(QT_MOC) -o $@ $(minori_includes) $<
266 267