From 80290e7d65dc498e9ea5e64aa6cbc65282072deb Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 18 Jun 2021 07:27:57 +0200 Subject: New dependency system. --- cppbuild.cc | 82 ++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 31 deletions(-) (limited to 'cppbuild.cc') diff --git a/cppbuild.cc b/cppbuild.cc index 370e179..737ba83 100644 --- a/cppbuild.cc +++ b/cppbuild.cc @@ -23,11 +23,8 @@ std::vector configs() return { { - // target - "plugingui", - - // source files - { + .target = "plugingui", + .sources = { "drumgizmo/src/audiocache.cc", "drumgizmo/src/audiocacheeventhandler.cc", "drumgizmo/src/audiocachefile.cc", @@ -69,6 +66,50 @@ std::vector configs() "drumgizmo/src/velocityfilter.cc", "drumgizmo/src/versionstr.cc", "drumgizmo/src/zrwrapper.cc", + "drumgizmo/zita-resampler/libs/cresampler.cc", + "drumgizmo/zita-resampler/libs/resampler-table.cc", + "drumgizmo/zita-resampler/libs/resampler.cc", + "drumgizmo/zita-resampler/libs/vresampler.cc", + "drumgizmo/hugin/hugin.c", + "drumgizmo/pugixml/src/pugixml.cpp", + "drumgizmo/plugingui/lodepng/lodepng.cpp", + }, + .depends = { + "plugingui.a", + }, + .cxxflags = { + "-DUI_X11", + "-O3", + "-g", + "-Wall", + "-Werror", + "-std=c++11", + "-Idrumgizmo/getoptpp", + "-Idrumgizmo/", + "-Idrumgizmo/hugin", + "-Idrumgizmo/plugingui/", + "-Idrumgizmo/src/", + "-Idrumgizmo/zita-resampler/libs", + "-Idrumgizmo/pugixml/src", + }, + .cflags = { + "-g", + //"-O3", + "-Wall", + "-Werror", + }, + .ldflags = { + "-lm", + "-lX11", + "-lXext", + "-lsndfile", + "-pthread", + } + }, + + { + .target = "plugingui.a", + .sources = { "drumgizmo/plugingui/abouttab.cc", "drumgizmo/plugingui/bleedcontrolframecontent.cc", "drumgizmo/plugingui/button.cc", @@ -130,18 +171,11 @@ std::vector configs() "drumgizmo/plugingui/voicelimitframecontent.cc", "drumgizmo/plugingui/widget.cc", "drumgizmo/plugingui/window.cc", - "drumgizmo/zita-resampler/libs/cresampler.cc", - "drumgizmo/zita-resampler/libs/resampler-table.cc", - "drumgizmo/zita-resampler/libs/resampler.cc", - "drumgizmo/zita-resampler/libs/vresampler.cc", - "drumgizmo/hugin/hugin.c", - "drumgizmo/pugixml/src/pugixml.cpp", - "drumgizmo/plugingui/lodepng/lodepng.cpp", }, - - // cxx flags - { + .depends = {}, + .cxxflags = { "-DUI_X11", + "-O3", "-g", "-Wall", "-Werror", @@ -154,22 +188,8 @@ std::vector configs() "-Idrumgizmo/zita-resampler/libs", "-Idrumgizmo/pugixml/src", }, - - // c flags - { - "-g", - "-Wall", - "-Werror", - }, - - // linker flags - { - "-lm", - "-lX11", - "-lXext", - "-pthread", - "-lsndfile", - } + .cflags = {}, + .ldflags = {} }, }; } -- cgit v1.2.3