Mercurial > minori
diff Makefile.am @ 242:82470f83f0c2
autotools: make windows build work
also, I've added back the method I made for getting the vars as
variables rather than separate files, so less clutter in tmp folders :)
| author | Paper <paper@paper.us.eu.org> |
|---|---|
| date | Mon, 22 Jan 2024 19:06:23 -0800 |
| parents | 06d6c351925c |
| children | ed5ab3896666 |
line wrap: on
line diff
--- a/Makefile.am Mon Jan 22 16:36:19 2024 -0500 +++ b/Makefile.am Mon Jan 22 19:06:23 2024 -0800 @@ -90,15 +90,17 @@ if BUILD_WIN files_win = src/sys/win32/dark_theme.cc +libs_win = -lole32 -luuid if BUILD_WINDRES # Untested... -wrcflags_version = -DWRC_VERSION=0,`echo '$(PACKAGE_VERSION)' | sed 's/(\d+)\.(\d+)\.(\d+)/\1,\2,\3/'` -WRCFLAGS = --use-temp-file -I. -I$(srcdir) $(wrcflags_version) +wrcflags_version = -DWRC_VERSION=0,`echo $(PACKAGE_VERSION) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1,\2,\3/'` + +WRCFLAGS = --use-temp-file -I. -I$(srcdir) $(wrcflags_version) $(CPPFLAGS) .rc.$(OBJEXT): $(WINDRES) $(WRCFLAGS) -i $< -o $@ -files_windres=rc/win32/version.rc +files_windres=rc/win32/version.rc rc/win32/resource.rc endif endif @@ -170,7 +172,7 @@ minori_LDFLAGS = $(ldflags_osx) minori_DEPENDENCIES = dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la -minori_LDADD = $(libs_glib) $(libs_osx) @LIBCURL@ @QT_LIBS@ dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la +minori_LDADD = $(libs_glib) $(libs_osx) $(libs_win) @LIBCURL@ @QT_LIBS@ dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la .h_moc.cc: @MKDIR_P@ -- `dirname $@`