##// END OF EJS Templates
Fixed some builds issues
jeandet -
r8:79b3f038ed29 default
parent child
Show More
@@ -0,0 +1,2
1 top_srcdir=$$PWD
2 top_builddir=$$shadowed($$PWD)
@@ -0,0 +1,2
1 top_srcdir=$$PWD
2 top_builddir=$$shadowed($$PWD)
@@ -0,0 +1,2
1 top_srcdir=$$PWD
2 top_builddir=$$shadowed($$PWD)
@@ -1,67 +1,67
1 #==================================================
1 #==================================================
2 #
2 #
3 # _|_| _|_|_| _| _| _|
3 # _|_| _|_|_| _| _| _|
4 # _| _| _| _| _|_|_|
4 # _| _| _| _| _|_|_|
5 # _| _|_| _| _| _| _| _|
5 # _| _|_| _| _| _| _| _|
6 # _| _| _| _| _| _| _|
6 # _| _| _| _| _| _| _|
7 # _|_| _| _|_|_| _| _| _|_|_|
7 # _|_| _| _|_|_| _| _| _|_|_|
8 #
8 #
9 #==================================================
9 #==================================================
10 #
10 #
11 #
11 #
12
12
13 QT += core gui
13 QT += core gui
14
14
15 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
15 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
16
16
17 TARGET = QIlib
17 TARGET = QIlib
18 TEMPLATE = lib
18 TEMPLATE = lib
19
19
20 LIBS += -lfl
20 LIBS += -lfl
21
21
22 MOC_DIR = moc
22 MOC_DIR = moc
23 RCC_DIR = resources
23 RCC_DIR = resources
24 OBJECTS_DIR = obj
24 OBJECTS_DIR = obj
25 DESTDIR = ../bin
25 DESTDIR = ../bin
26
26
27 include ( ./parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri )
27 include ( ./parsers/Flex_Bison_FIles/Flex_Bison_FIles.pri )
28
28
29 qilibcfg.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
29 qilibcfg.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
30 qilibcfg.files = \
30 qilibcfg.files = \
31 qilib.prf
31 qilib.prf
32
32
33 target.path = $$[QT_INSTALL_LIBS]
33 target.path = $$[QT_INSTALL_LIBS]
34
34
35 qilibHeaders.path = $$[QT_INSTALL_HEADERS]/QIlib
35 qilibHeaders.path = $$[QT_INSTALL_HEADERS]/QIlib
36 qilibHeaders.files = \
36 qilibHeaders.files = \
37 qicadnetlist.h \
37 qicadnetlist.h \
38 qicadpcb.h \
38 qicadpcb.h \
39 qicadlisplikelexique.h
39 qicadlisplikelexique.h
40
40
41 qilibParsersHeaders.path = $$[QT_INSTALL_HEADERS]/QIlib/parsers
41 qilibParsersHeaders.path = $$[QT_INSTALL_HEADERS]/QIlib/parsers
42 qilibParsersHeaders.files = \
42 qilibParsersHeaders.files = \
43 parsers/lispLike_driver.h \
43 parsers/lispLike_driver.h \
44 parsers/lispLike_scanner.h
44 parsers/lispLike_scanner.h
45
45
46
46
47 INSTALLS += target qilibHeaders qilibParsersHeaders qilibcfg
47 INSTALLS += target qilibHeaders qilibParsersHeaders qilibcfg
48
48
49 INCLUDEPATH += ./parsers
49 INCLUDEPATH += ./qilib/lispLike ./parsers
50
50
51 SOURCES += \
51 SOURCES += \
52 qicadnetlist.cpp \
52 qicadnetlist.cpp \
53 parsers/lispLike_driver.cpp \
53 parsers/lispLike_driver.cpp \
54 parsers/lispLike_scanner.cpp \
54 parsers/lispLike_scanner.cpp \
55 qicadpcb.cpp \
55 qicadpcb.cpp \
56 qicadlisplikelexique.cpp
56 qicadlisplikelexique.cpp
57
57
58
58
59 HEADERS += \
59 HEADERS += \
60 qicadnetlist.h \
60 qicadnetlist.h \
61 parsers/lispLike_driver.h \
61 parsers/lispLike_driver.h \
62 parsers/lispLike_scanner.h \
62 parsers/lispLike_scanner.h \
63 qicadpcb.h \
63 qicadpcb.h \
64 qicadlisplikelexique.h
64 qicadlisplikelexique.h
65
65
66 OTHER_FILES += qilib.prf
66 OTHER_FILES += qilib.prf
67
67
@@ -1,41 +1,41
1 #-------------------------------------------------
1 #-------------------------------------------------
2 #
2 #
3 # Project created by QtCreator 2015-06-11T21:37:25
3 # Project created by QtCreator 2015-06-11T21:37:25
4 #
4 #
5 #-------------------------------------------------
5 #-------------------------------------------------
6
6
7 QT += core gui opengl
7 QT += core gui opengl
8 CONFIG += qilib
8 CONFIG += qilib
9
9
10 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
10 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
11
11
12 TARGET = PCBView
12 TARGET = PCBView
13 TEMPLATE = app
13 TEMPLATE = app
14
14
15 MOC_DIR = moc
15 MOC_DIR = moc
16 RCC_DIR = resources
16 RCC_DIR = resources
17 OBJECTS_DIR = obj
17 OBJECTS_DIR = obj
18 DESTDIR = ../../bin
18 DESTDIR = ../../bin
19
19
20 INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/
20 INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/ $${DESTDIR}/../qilib/lispLike/
21
21
22 LIBS += -L../../bin -lQIlib
22 LIBS += -L../../bin -lQIlib
23
23
24 SOURCES += main.cpp\
24 SOURCES += main.cpp\
25 mainwindow.cpp \
25 mainwindow.cpp \
26 pcbgraphicview.cpp \
26 pcbgraphicview.cpp \
27 pcbrectpad.cpp \
27 pcbrectpad.cpp \
28 pcbmodule.cpp \
28 pcbmodule.cpp \
29 pcbline.cpp \
29 pcbline.cpp \
30 pcbcontext.cpp \
30 pcbcontext.cpp \
31 pcbvia.cpp
31 pcbvia.cpp
32
32
33 HEADERS += mainwindow.h \
33 HEADERS += mainwindow.h \
34 pcbgraphicview.h \
34 pcbgraphicview.h \
35 pcbrectpad.h \
35 pcbrectpad.h \
36 pcbmodule.h \
36 pcbmodule.h \
37 pcbline.h \
37 pcbline.h \
38 pcbcontext.h \
38 pcbcontext.h \
39 pcbvia.h
39 pcbvia.h
40
40
41 FORMS += mainwindow.ui
41 FORMS += mainwindow.ui
@@ -1,51 +1,55
1 QT += core gui
1 QT += core gui
2 CONFIG += qilib
2 CONFIG += qilib
3
3
4 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
4 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
5
5
6 TARGET = LispLikeDump
6 TARGET = LispLikeDump
7 TEMPLATE = app
7 TEMPLATE = app
8 MOC_DIR = moc
8 MOC_DIR = moc
9 RCC_DIR = resources
9 RCC_DIR = resources
10 OBJECTS_DIR = obj
10 OBJECTS_DIR = obj
11 DESTDIR = ../../bin
11 DESTDIR = ../../bin
12
12
13 SOURCES += main.cpp
13 SOURCES += main.cpp
14
14
15 INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/
15 INCLUDEPATH += ../../bin/../../qilib \
16 ../../qilib
17
18 message("top_builddir" $$top_builddir)
19 message("top_srcdir" $$top_srcdir)
16
20
17 LIBS += -L../../bin -lQIlib
21 LIBS += -L../../bin -lQIlib
18
22
19 FILESTOCOPY.files += \
23 FILESTOCOPY.files += \
20 $${PWD}/../testFiles/netlist1.net \
24 $${PWD}/../testFiles/netlist1.net \
21 $${PWD}/../testFiles/netlist2.net \
25 $${PWD}/../testFiles/netlist2.net \
22 $${PWD}/../testFiles/pcb1.kicad_pcb\
26 $${PWD}/../testFiles/pcb1.kicad_pcb\
23 $${PWD}/../testFiles/pcb2.kicad_pcb\
27 $${PWD}/../testFiles/pcb2.kicad_pcb\
24 $${PWD}/../testFiles/pcb3.kicad_pcb
28 $${PWD}/../testFiles/pcb3.kicad_pcb
25
29
26 FILESTOCOPY.path = $${DESTDIR}
30 FILESTOCOPY.path = $${DESTDIR}
27
31
28 message($${DESTDIR})
32 message($${DESTDIR})
29
33
30 defineTest(copyFiles) {
34 defineTest(copyFiles) {
31 files = $$1
35 files = $$1
32 DDIR = $$2
36 DDIR = $$2
33 win32:DDIR ~= s,/,\\,g
37 win32:DDIR ~= s,/,\\,g
34 QMAKE_POST_LINK += $$QMAKE_MKDIR $$quote($$DDIR) $$escape_expand(\\n\\t)
38 QMAKE_POST_LINK += $$QMAKE_MKDIR $$quote($$DDIR) $$escape_expand(\\n\\t)
35 for(FILE, files) {
39 for(FILE, files) {
36 message(copying file $$FILE to $$DIR)
40 message(copying file $$FILE to $$DIR)
37 # Replace slashes in paths with backslashes for Windows
41 # Replace slashes in paths with backslashes for Windows
38 win32:FILE ~= s,/,\\,g
42 win32:FILE ~= s,/,\\,g
39 QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
43 QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
40 }
44 }
41 export(QMAKE_POST_LINK)
45 export(QMAKE_POST_LINK)
42 }
46 }
43
47
44
48
45
49
46 !isEmpty(FILESTOCOPY.files) {
50 !isEmpty(FILESTOCOPY.files) {
47 copyFiles($$FILESTOCOPY.files,$$FILESTOCOPY.path)
51 copyFiles($$FILESTOCOPY.files,$$FILESTOCOPY.path)
48 }
52 }
49
53
50
54
51
55
General Comments 0
You need to be logged in to leave comments. Login now