Mercurial > minori
diff Makefile.am @ 237:a7d0d543b334
*: make OS X builds succeed
new script: deploy_build.sh, creates the app bundle
author | Paper <paper@paper.us.eu.org> |
---|---|
date | Fri, 19 Jan 2024 11:14:44 -0500 |
parents | 4d461ef7d424 |
children | 06d6c351925c |
line wrap: on
line diff
--- a/Makefile.am Fri Jan 19 00:24:02 2024 -0500 +++ b/Makefile.am Fri Jan 19 11:14:44 2024 -0500 @@ -79,8 +79,10 @@ endif if BUILD_OSX -files_osx = src/sys/osx/dark_theme.cc src/sys/osx/filesystem.cc -libs_osx = Foundation AppKit +files_osx = src/sys/osx/dark_theme.cc src/sys/osx/filesystem.cc src/sys/osx/permissions.cc +cflags_osx = -mmacosx-version-min=10.15 +libs_osx = -lobjc +ldflags_osx = -framework Foundation -framework AppKit endif minori_SOURCES = \ @@ -139,19 +141,17 @@ -I$(top_srcdir)/dep/anitomy \ -I$(top_srcdir)/dep -minori_CPPFLAGS = $(minori_includes) @QT_CXXFLAGS@ @LIBCURL_CPPFLAGS@ -minori_CXXFLAGS = $(cflags_glib) $(cflags_win) $(cflags_osx) +minori_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(minori_includes) +minori_CXXFLAGS = @QT_CXXFLAGS@ $(cflags_osx) $(cflags_glib) $(cflags_win) -std=c++17 +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 -.qrc_qrc.cc: - - .h_moc.cc: @MKDIR_P@ -- `dirname $@` @QT_MOC@ -o $@ $(minori_includes) $< -SUFFIXES = .h _moc.cc .qrc _qrc.cc +SUFFIXES = .h _moc.cc SUBDIRS = $(subdirs) ACLOCAL_AMFLAGS = -I m4