update project config
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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"]
 | 
			
		||||
@@ -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"]
 | 
			
		||||
		Reference in New Issue
	
	Block a user