Mercurial > hg > octave-max

annotate gui/src/src.pro @ 14318:df86157a4912 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-enable MSVC/Win32 compilation. * gui/src/MainWindow.h: Include <QCloseEvent>. * gui/src/msvc.pri: New file * gui/src/src.pro: Use it. * .hgsubstate: Update to current tip of qirc and qterminal repos.
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 02 Feb 2012 22:32:30 +0000
parents f13f4f4360cb
children 97cb9286919c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13504
13e3d60aff2d Replaced Quint with OctaveGUI.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13502
diff changeset
1 # OctaveGUI - A graphical user interface for Octave
13674
c0e66d6e3dc8 Updated license headers and moved to AGPLv3.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13673
diff changeset
2 # Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com)
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
3 #
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
4 # This program is free software: you can redistribute it and/or modify
14290
faece6b2ab90 Corrected license headers in all files to GPL.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14289
diff changeset
5 # it under the terms of the GNU General Public License as
13674
c0e66d6e3dc8 Updated license headers and moved to AGPLv3.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13673
diff changeset
6 # published by the Free Software Foundation, either version 3 of the
c0e66d6e3dc8 Updated license headers and moved to AGPLv3.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13673
diff changeset
7 # License, or (at your option) any later version.
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
8 #
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
9 # This program is distributed in the hope that it will be useful,
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14290
faece6b2ab90 Corrected license headers in all files to GPL.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14289
diff changeset
12 # GNU General Public License for more details.
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
13 #
14290
faece6b2ab90 Corrected license headers in all files to GPL.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14289
diff changeset
14 # You should have received a copy of the GNU General Public License
13674
c0e66d6e3dc8 Updated license headers and moved to AGPLv3.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13673
diff changeset
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
16
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
17 # Basic settings:
13579
6568fccb8940 Updated russian and ukrainian translation files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13574
diff changeset
18 QT += core gui webkit network # Qt modules
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
19 TEMPLATE = app # Build as application
13502
751bbbcfd6e3 Renamed project files and target binary to octave-gui.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13501
diff changeset
20 TARGET = octave-gui # Name of the target binary
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
21
14302
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
22 DESTDIR = ../bin # Destination of the output
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
23
13561
dd029759f57e Corrected language files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13558
diff changeset
24 TRANSLATIONS += languages/generic.ts \
13566
d22b9973120f Renamed language files to match convention.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13563
diff changeset
25 languages/de-de.ts \
13572
7fff75c62f30 Added spanish translation.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13566
diff changeset
26 languages/pt-br.ts \
13573
908c86cfe656 Added russian and ukrainian translation.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13572
diff changeset
27 languages/es-es.ts \
908c86cfe656 Added russian and ukrainian translation.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13572
diff changeset
28 languages/ru-ru.ts \
13574
4f44084ce322 Corrected language files for russian and ukrainian.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13573
diff changeset
29 languages/uk-ua.ts # Available translations
14318
df86157a4912 Re-enable MSVC/Win32 compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14305
diff changeset
30
df86157a4912 Re-enable MSVC/Win32 compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14305
diff changeset
31 win32-msvc*: include(msvc.pri)
df86157a4912 Re-enable MSVC/Win32 compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14305
diff changeset
32
14269
4a6867289e24 Removed the old IRC Client code and replaced it by qirc.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14265
diff changeset
33 LIBS += -lqscintilla2 \
14318
df86157a4912 Re-enable MSVC/Win32 compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14305
diff changeset
34 -L../qirc/libqirc/$$LIBDIR_SUFFIX -lqirc \
df86157a4912 Re-enable MSVC/Win32 compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14305
diff changeset
35 -L../qterminal/libqterminal/$$LIBDIR_SUFFIX -lqterminal \
14269
4a6867289e24 Removed the old IRC Client code and replaced it by qirc.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14265
diff changeset
36 $$system(mkoctfile -p LIBS) \
4a6867289e24 Removed the old IRC Client code and replaced it by qirc.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14265
diff changeset
37 $$system(mkoctfile -p OCTAVE_LIBS)
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
38
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
39 mac {
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
40 CONFIG -= app_bundle
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
41 }
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
42
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
43 # Includepaths and libraries to link against:
14302
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
44 INCLUDEPATH += . backend ../qterminal/libqterminal ../qirc/libqirc \
13673
6a11fd0efa16 Bugfix for building on Debian.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13668
diff changeset
45 $$system(mkoctfile -p INCFLAGS)
13596
f6bb48258200 Corrected mistake.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13595
diff changeset
46 INCFLAGS += $$system(mkoctfile -p INCFLAGS)
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
47 mac {
14291
c39c7f2b1e46 Replaced local-native with local in octave-gui.pro for building on MacOS.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14290
diff changeset
48 INCFLAGS += -I/opt/local/include
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
49 }
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
50
13769
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
51 QMAKE_LIBDIR += $$system(octave-config -p OCTLIBDIR)
14305
f13f4f4360cb Added missing RPATH in src.pro.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14304
diff changeset
52 unix {
f13f4f4360cb Added missing RPATH in src.pro.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14304
diff changeset
53 QMAKE_RPATHDIR += $$system(octave-config -p OCTLIBDIR)
f13f4f4360cb Added missing RPATH in src.pro.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14304
diff changeset
54 }
13769
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
55
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
56 mac {
14291
c39c7f2b1e46 Replaced local-native with local in octave-gui.pro for building on MacOS.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14290
diff changeset
57 LFLAGS += -L/opt/local/lib
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
58 }
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
59
13682
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
60 unix {
14302
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
61 LIBS += -lutil
13682
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
62 }
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
63
13769
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
64 win32-g++ {
13682
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
65 QMAKE_LFLAGS += --enable-auto-import
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
66 }
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
67
13769
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
68 win32-msvc* {
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
69 DEFINES += QSCINTILLA_DLL
14318
df86157a4912 Re-enable MSVC/Win32 compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14305
diff changeset
70 QMAKE_CXXFLAGS += -wd4244
13769
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
71 }
43ffcaee3fea Fix various issues under Windows (MSVC)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13683
diff changeset
72
13682
c0e0625ffd13 Adjustements for compiling on Windows.
Jacob@Jacob-PC
parents: 13679
diff changeset
73 QMAKE_LFLAGS += $$LFLAGS $$system(mkoctfile -p RLD_FLAG)
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
74 QMAKE_CXXFLAGS += $$INCFLAGS
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
75
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
76 # Files associated with the project:
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
77 SOURCES +=\
14302
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
78 lexer/lexeroctavegui.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
79 MainWindow.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
80 WorkspaceView.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
81 HistoryDockWidget.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
82 FilesDockWidget.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
83 FileEditorMdiSubWindow.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
84 BrowserWidget.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
85 SettingsDialog.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
86 OctaveGUI.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
87 ResourceManager.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
88 CommandLineParser.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
89 backend/OctaveCallbackThread.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
90 backend/OctaveLink.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
91 backend/OctaveMainThread.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
92 backend/ReadlineAdapter.cpp \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
93 WelcomeWizard.cpp
13869
d80086a9880e Initial implementation of a Qt Win32 terminal widget.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13769
diff changeset
94
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
95 HEADERS += \
14302
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
96 lexer/lexeroctavegui.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
97 MainWindow.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
98 WorkspaceView.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
99 HistoryDockWidget.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
100 FilesDockWidget.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
101 FileEditorMdiSubWindow.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
102 BrowserWidget.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
103 SettingsDialog.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
104 ResourceManager.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
105 CommandLineParser.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
106 backend/OctaveCallbackThread.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
107 backend/OctaveLink.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
108 backend/OctaveMainThread.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
109 backend/ReadlineAdapter.h \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
110 WelcomeWizard.h
13869
d80086a9880e Initial implementation of a Qt Win32 terminal widget.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 13769
diff changeset
111
13501
86d6c3b90ad7 Added new gui files.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
112 FORMS += \
14302
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
113 SettingsDialog.ui \
cccdd42eb573 Cleaned up and subsummarized projects under a subdirectory project.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14297
diff changeset
114 WelcomeWizard.ui