From 830cb691ca3fa6655ceca57ef2bd65af8d29663d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Thu, 6 Apr 2023 11:35:14 +0800 Subject: tomlc99 is a git submodule instead so we don't have to make any extra effort to make it build on other platforms --- .gitmodules | 3 +++ bootstrap.cxx | 2 +- bootstrap.pro | 5 +++-- tomlc99 | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 tomlc99 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f033c8c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tomlc99"] + path = tomlc99 + url = https://github.com/cktan/tomlc99 diff --git a/bootstrap.cxx b/bootstrap.cxx index f5d96f1..921a190 100644 --- a/bootstrap.cxx +++ b/bootstrap.cxx @@ -1,4 +1,4 @@ -#include +#include "tomlc99/toml.h" #include "bootstrap.hxx" Bootstrap::Bootstrap(QObject *parent): diff --git a/bootstrap.pro b/bootstrap.pro index e9fa9f7..d172396 100644 --- a/bootstrap.pro +++ b/bootstrap.pro @@ -16,8 +16,9 @@ style.files = \ style.path = $$[QT_INSTALL_QML]/QtQuick/Controls.2/$$QML_IMPORT_NAME HEADERS += $${TARGET}.hxx -SOURCES += $${TARGET}.cxx -LIBS += -ltoml +SOURCES += \ + $${TARGET}.cxx \ + tomlc99/toml.c TARGET = qqc2$$TARGET target.path = $$[QT_INSTALL_QML]/$$QML_IMPORT_NAME diff --git a/tomlc99 b/tomlc99 new file mode 160000 index 0000000..8949028 --- /dev/null +++ b/tomlc99 @@ -0,0 +1 @@ +Subproject commit 894902820a3ea2f1ec470cd7fe338bde54045cf5 -- cgit v1.2.3