Mercurial > hg > octave-thorsten

changeset 13682:c0e0625ffd13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjustements for compiling on Windows.
author Jacob@Jacob-PC
date Mon, 26 Sep 2011 07:55:20 +0200
parents ee7f4294d162
children 25dc40d24a44
files gui/octave-gui.pro gui/src/TerminalView.cpp gui/src/terminal/KPty.cpp gui/src/terminal/KPtyDevice.cpp gui/src/terminal/LinuxTerminalEmulation.cpp gui/src/terminal/TerminalEmulation.cpp
diffstat 6 files changed, 50 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/gui/octave-gui.pro
+++ b/gui/octave-gui.pro
@@ -31,7 +31,7 @@
                        languages/es-es.ts \
                        languages/ru-ru.ts \
                        languages/uk-ua.ts           # Available translations
-LIBS                += -lqscintilla2
+LIBS                += -lqscintilla2 $$system(mkoctfile -p LIBS) $$system(mkoctfile -p OCTAVE_LIBS)
 
 mac {
     CONFIG -= app_bundle
@@ -52,19 +52,27 @@
     LFLAGS += -L/opt/local-native/lib
 }
 
-QMAKE_LFLAGS        += $$LFLAGS -lutil $$system(mkoctfile -p RLD_FLAG)
+unix {
+    QMAKE_LFLAGS +=  -lutil
+}
+
+win32 {
+    QMAKE_LFLAGS += --enable-auto-import
+}
+
+QMAKE_LFLAGS        += $$LFLAGS $$system(mkoctfile -p RLD_FLAG)
 QMAKE_CXXFLAGS      += $$INCFLAGS
 
 # Files associated with the project:
 SOURCES +=\
-        src/lexer/lexeroctavegui.cpp \
-        src/MainWindow.cpp \
-    	  src/VariablesDockWidget.cpp \
-    	  src/HistoryDockWidget.cpp \
-    	  src/FilesDockWidget.cpp \
-    	  src/FileEditorMdiSubWindow.cpp \
-    	  src/BrowserWidget.cpp \
-    	  src/ImageViewerMdiSubWindow.cpp \
+    src/lexer/lexeroctavegui.cpp \
+    src/MainWindow.cpp \
+    src/VariablesDockWidget.cpp \
+    src/HistoryDockWidget.cpp \
+    src/FilesDockWidget.cpp \
+    src/FileEditorMdiSubWindow.cpp \
+    src/BrowserWidget.cpp \
+    src/ImageViewerMdiSubWindow.cpp \
     src/irc/IRCWidget.cpp \
     src/SettingsDialog.cpp \
     src/OctaveGUI.cpp \
@@ -75,23 +83,27 @@
     src/backend/OctaveMainThread.cpp \
     src/irc/IRCClientImpl.cpp \
     src/terminal/TerminalEmulation.cpp \
-    src/terminal/LinuxTerminalEmulation.cpp \
     src/backend/ReadlineAdapter.cpp \
-    src/terminal/KPty.cpp \
-    src/terminal/KPtyDevice.cpp \
     src/TerminalView.cpp \
     src/TerminalHighlighter.cpp \
     src/WelcomeWizard.cpp
 
+unix {
+SOURCES +=\
+    src/terminal/LinuxTerminalEmulation.cpp \
+    src/terminal/KPty.cpp \
+    src/terminal/KPtyDevice.cpp
+}
+
 HEADERS += \
-        src/lexer/lexeroctavegui.h \
-    	  src/MainWindow.h \
-    	  src/VariablesDockWidget.h \
-    	  src/HistoryDockWidget.h \
-    	  src/FilesDockWidget.h \
-    	  src/FileEditorMdiSubWindow.h \
-    	  src/BrowserWidget.h \
-    	  src/ImageViewerMdiSubWindow.h \
+    src/lexer/lexeroctavegui.h \
+    src/MainWindow.h \
+    src/VariablesDockWidget.h \
+    src/HistoryDockWidget.h \
+    src/FilesDockWidget.h \
+    src/FileEditorMdiSubWindow.h \
+    src/BrowserWidget.h \
+    src/ImageViewerMdiSubWindow.h \
     src/irc/IRCWidget.h \
     src/SettingsDialog.h \
     src/ResourceManager.h \
@@ -102,14 +114,18 @@
     src/irc/IRCClientInterface.h \
     src/irc/IRCClientImpl.h \
     src/terminal/TerminalEmulation.h \
-    src/terminal/LinuxTerminalEmulation.h \
     src/backend/ReadlineAdapter.h \
-    src/terminal/KPtyDevice.h \
-    src/terminal/KPty.h \
     src/TerminalView.h \
     src/TerminalHighlighter.h \
     src/WelcomeWizard.h
 
+unix {
+HEADERS += \
+    src/terminal/LinuxTerminalEmulation.h \
+    src/terminal/KPtyDevice.h \
+    src/terminal/KPty.h
+}
+
 FORMS += \
     src/SettingsDialog.ui \
     src/WelcomeWizard.ui
--- a/gui/src/TerminalView.cpp
+++ b/gui/src/TerminalView.cpp
@@ -53,13 +53,13 @@
 void
 TerminalView::bell ()
 {
-
 }
 
 void
 TerminalView::keyPressEvent (QKeyEvent * keyEvent)
 {
-  m_terminalEmulation->processKeyEvent (keyEvent);
+  if(m_terminalEmulation)
+    m_terminalEmulation->processKeyEvent (keyEvent);
 }
 
 void
--- a/gui/src/terminal/KPty.cpp
+++ b/gui/src/terminal/KPty.cpp
@@ -22,6 +22,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+
 #include "KPty.h"
 
 #include <QtCore/Q_PID>
--- a/gui/src/terminal/KPtyDevice.cpp
+++ b/gui/src/terminal/KPtyDevice.cpp
@@ -21,6 +21,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+
 #include "KPtyDevice.h"
 #define i18n
 
@@ -452,3 +453,4 @@
   d->writeNotifier->setEnabled (true);
   return len;
 }
+
--- a/gui/src/terminal/LinuxTerminalEmulation.cpp
+++ b/gui/src/terminal/LinuxTerminalEmulation.cpp
@@ -15,6 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "LinuxTerminalEmulation.h"
 
 LinuxTerminalEmulation::LinuxTerminalEmulation ()
--- a/gui/src/terminal/TerminalEmulation.cpp
+++ b/gui/src/terminal/TerminalEmulation.cpp
@@ -28,6 +28,10 @@
   terminalEmulation->m_terminal = terminal;
   return terminalEmulation;
 #endif
+#ifdef Q_OS_WIN
+  // TODO: Implement on Windows.
+  return 0;
+#endif
 }
 
 TerminalEmulation::TerminalEmulation ()