comparison 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
comparison
equal deleted inserted replaced
241:06d6c351925c 242:82470f83f0c2
88 libs_glib = @GIO_LIBS@ 88 libs_glib = @GIO_LIBS@
89 endif 89 endif
90 90
91 if BUILD_WIN 91 if BUILD_WIN
92 files_win = src/sys/win32/dark_theme.cc 92 files_win = src/sys/win32/dark_theme.cc
93 libs_win = -lole32 -luuid
93 94
94 if BUILD_WINDRES 95 if BUILD_WINDRES
95 # Untested... 96 # Untested...
96 wrcflags_version = -DWRC_VERSION=0,`echo '$(PACKAGE_VERSION)' | sed 's/(\d+)\.(\d+)\.(\d+)/\1,\2,\3/'`
97 97
98 WRCFLAGS = --use-temp-file -I. -I$(srcdir) $(wrcflags_version) 98 wrcflags_version = -DWRC_VERSION=0,`echo $(PACKAGE_VERSION) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1,\2,\3/'`
99
100 WRCFLAGS = --use-temp-file -I. -I$(srcdir) $(wrcflags_version) $(CPPFLAGS)
99 .rc.$(OBJEXT): 101 .rc.$(OBJEXT):
100 $(WINDRES) $(WRCFLAGS) -i $< -o $@ 102 $(WINDRES) $(WRCFLAGS) -i $< -o $@
101 files_windres=rc/win32/version.rc 103 files_windres=rc/win32/version.rc rc/win32/resource.rc
102 endif 104 endif
103 endif 105 endif
104 106
105 if BUILD_OSX 107 if BUILD_OSX
106 files_osx = src/sys/osx/dark_theme.cc src/sys/osx/filesystem.cc src/sys/osx/permissions.cc 108 files_osx = src/sys/osx/dark_theme.cc src/sys/osx/filesystem.cc src/sys/osx/permissions.cc
168 minori_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(minori_includes) 170 minori_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(minori_includes)
169 minori_CXXFLAGS = @QT_CXXFLAGS@ $(cflags_osx) $(cflags_glib) $(cflags_win) -std=c++17 171 minori_CXXFLAGS = @QT_CXXFLAGS@ $(cflags_osx) $(cflags_glib) $(cflags_win) -std=c++17
170 minori_LDFLAGS = $(ldflags_osx) 172 minori_LDFLAGS = $(ldflags_osx)
171 173
172 minori_DEPENDENCIES = dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la 174 minori_DEPENDENCIES = dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la
173 minori_LDADD = $(libs_glib) $(libs_osx) @LIBCURL@ @QT_LIBS@ dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la 175 minori_LDADD = $(libs_glib) $(libs_osx) $(libs_win) @LIBCURL@ @QT_LIBS@ dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la
174 176
175 .h_moc.cc: 177 .h_moc.cc:
176 @MKDIR_P@ -- `dirname $@` 178 @MKDIR_P@ -- `dirname $@`
177 @QT_MOC@ -o $@ $(minori_includes) $< 179 @QT_MOC@ -o $@ $(minori_includes) $<
178 180