From f44a75621f975063cec1d9b45241ab6cd3327979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Thu, 13 May 2021 11:31:34 +0800
Subject: [PATCH] update project config

---
 doric-Qt/example/app/app.pro                     | 16 +---------------
 doric-Qt/example/doric/doric.pro                 |  5 +----
 .../{ => doric/scripts}/conanfile-macos.py       |  4 ++--
 .../{ => doric/scripts}/conanfile-windows.py     |  4 ++--
 .../example/{ => doric/scripts}/package-macos.py |  0
 .../{ => doric/scripts}/package-windows.py       |  0
 6 files changed, 6 insertions(+), 23 deletions(-)
 rename doric-Qt/example/{ => doric/scripts}/conanfile-macos.py (55%)
 rename doric-Qt/example/{ => doric/scripts}/conanfile-windows.py (55%)
 rename doric-Qt/example/{ => doric/scripts}/package-macos.py (100%)
 rename doric-Qt/example/{ => doric/scripts}/package-windows.py (100%)

diff --git a/doric-Qt/example/app/app.pro b/doric-Qt/example/app/app.pro
index b5520200..715e5fa8 100644
--- a/doric-Qt/example/app/app.pro
+++ b/doric-Qt/example/app/app.pro
@@ -53,20 +53,6 @@ else:unix: {
     LIBS += -lv8_monolith
 }
 
-macx: LIBS += -L$$OUT_PWD/../doric/ -ldoric
-
 INCLUDEPATH += $$PWD/../doric
-DEPENDPATH += $$PWD/../doric
 
-macx: PRE_TARGETDEPS += $$OUT_PWD/../doric/libdoric.a
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../doric/release/ -ldoric
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../doric/debug/ -ldoric
-
-INCLUDEPATH += $$PWD/../doric
-DEPENDPATH += $$PWD/../doric
-
-win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../doric/release/libdoric.a
-else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../doric/debug/libdoric.a
-else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../doric/release/doric.lib
-else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../doric/debug/doric.lib
+LIBS += -L$$OUT_PWD/../../binary/doric -lDoricCore
diff --git a/doric-Qt/example/doric/doric.pro b/doric-Qt/example/doric/doric.pro
index 32f0da8e..b133e2f1 100644
--- a/doric-Qt/example/doric/doric.pro
+++ b/doric-Qt/example/doric/doric.pro
@@ -1,14 +1,11 @@
 QT += quick
 
 CONFIG += c++14
+TARGET = DoricCore
 
 TEMPLATE = lib
 CONFIG += staticlib
 
-DESTDIR = ../../binary/dest
-MOC_DIR = ../../binary/moc
-OBJECTS_DIR = ../../binary/objects
-
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Refer to the documentation for the
diff --git a/doric-Qt/example/conanfile-macos.py b/doric-Qt/example/doric/scripts/conanfile-macos.py
similarity index 55%
rename from doric-Qt/example/conanfile-macos.py
rename to doric-Qt/example/doric/scripts/conanfile-macos.py
index 5f2749eb..b4a6c88b 100644
--- a/doric-Qt/example/conanfile-macos.py
+++ b/doric-Qt/example/doric/scripts/conanfile-macos.py
@@ -6,7 +6,7 @@ class DoricCore(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
 
     def package(self):
-        self.copy("*.h", dst="include", src="doric")
-        self.copy("*.a", dst="lib",src="../binary/dest")
+        self.copy("*.h", dst="include", src="../../doric")
+        self.copy("*.a", dst="lib",src="../../../binary/doric")
     def package_info(self):
         self.cpp_info.libs = ["DoricCore"]
\ No newline at end of file
diff --git a/doric-Qt/example/conanfile-windows.py b/doric-Qt/example/doric/scripts/conanfile-windows.py
similarity index 55%
rename from doric-Qt/example/conanfile-windows.py
rename to doric-Qt/example/doric/scripts/conanfile-windows.py
index 5631411b..00e6ddf7 100644
--- a/doric-Qt/example/conanfile-windows.py
+++ b/doric-Qt/example/doric/scripts/conanfile-windows.py
@@ -6,7 +6,7 @@ class DoricCore(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
 
     def package(self):
-        self.copy("*.h", dst="include", src="doric")
-        self.copy("*.lib", dst="lib",src="../binary/dest")
+        self.copy("*.h", dst="include", src="../../doric")
+        self.copy("*.lib", dst="lib",src="../../../binary/doric")
     def package_info(self):
         self.cpp_info.libs = ["DoricCore"]
\ No newline at end of file
diff --git a/doric-Qt/example/package-macos.py b/doric-Qt/example/doric/scripts/package-macos.py
similarity index 100%
rename from doric-Qt/example/package-macos.py
rename to doric-Qt/example/doric/scripts/package-macos.py
diff --git a/doric-Qt/example/package-windows.py b/doric-Qt/example/doric/scripts/package-windows.py
similarity index 100%
rename from doric-Qt/example/package-windows.py
rename to doric-Qt/example/doric/scripts/package-windows.py