summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>2023-04-06 11:35:14 +0800
committerꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>2023-04-06 11:35:14 +0800
commit830cb691ca3fa6655ceca57ef2bd65af8d29663d (patch)
tree3994f85e77c52799c99d7f708cfa3adc1480dc28
parent25681590025e152900c2f98a6ffe111cbfc2656d (diff)
tomlc99 is a git submodule instead
so we don't have to make any extra effort to make it build on other platforms
-rw-r--r--.gitmodules3
-rw-r--r--bootstrap.cxx2
-rw-r--r--bootstrap.pro5
m---------tomlc990
4 files changed, 7 insertions, 3 deletions
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 <toml.h>
+#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
+Subproject 894902820a3ea2f1ec470cd7fe338bde54045cf