Mercurial > octave-nkf

changeset 13769:43ffcaee3fea gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix various issues under Windows (MSVC) * gui/msvc-debug.pri: New file to enable debugging in release mode. This is required to avoid mixing different VC++ runtime DLL. * gui/octave-gui.pro (QMAKE_LIBDIR): New variable containing octave library path. (LFLAGS): Remove, deprecated by QMAKE_LIBDIR addition. (win32-g++): Renamed win32 conditional with mingw-specific flags. (win32-msvc*): Include msvc-debug.pri, define required scintilla flag and use console mode (for the time being). * gui/src/lexer/lexeroctavegui.h (class LexerOctaveGui): Remove wrong QSCINTILLA_EXPORT decorator.
author Michael Goffioul <michael.goffioul@gmail.com>
date Fri, 28 Oct 2011 17:01:30 +0100
parents 5f71ab377898
children d80086a9880e
files gui/msvc-debug.pri gui/octave-gui.pro gui/src/lexer/lexeroctavegui.h
diffstat 3 files changed, 18 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui/msvc-debug.pri	Fri Oct 28 17:01:30 2011 +0100
@@ -0,0 +1,8 @@
+win32-msvc* {
+	CONFIG += release warn_off
+	QMAKE_CXXFLAGS += -MP
+	QMAKE_CXXFLAGS_RELEASE += -Zi
+	QMAKE_CXXFLAGS_RELEASE -= -O2
+	QMAKE_LFLAGS_RELEASE += -debug
+	QMAKE_CLEAN += $(DESTDIR)$(QMAKE_TARGET).pdb
+}
--- a/gui/octave-gui.pro	Tue Oct 25 11:28:41 2011 -0700
+++ b/gui/octave-gui.pro	Fri Oct 28 17:01:30 2011 +0100
@@ -45,9 +45,8 @@
     INCFLAGS += -I/opt/local-native/include
 }
 
-LFLAGS              += $$system(mkoctfile -p LFLAGS) \
-                       $$system(mkoctfile -p OCTAVE_LIBS) \
-                       $$system(mkoctfile -p LIBS)
+QMAKE_LIBDIR        += $$system(octave-config -p OCTLIBDIR)
+
 mac {
     LFLAGS += -L/opt/local-native/lib
 }
@@ -56,10 +55,16 @@
     QMAKE_LFLAGS +=  -lutil
 }
 
-win32 {
+win32-g++ {
     QMAKE_LFLAGS += --enable-auto-import
 }
 
+win32-msvc* {
+    DEFINES += QSCINTILLA_DLL
+    CONFIG += console
+    include(msvc-debug.pri)
+}
+
 QMAKE_LFLAGS        += $$LFLAGS $$system(mkoctfile -p RLD_FLAG)
 QMAKE_CXXFLAGS      += $$INCFLAGS
 
--- a/gui/src/lexer/lexeroctavegui.h	Tue Oct 25 11:28:41 2011 -0700
+++ b/gui/src/lexer/lexeroctavegui.h	Fri Oct 28 17:01:30 2011 +0100
@@ -25,7 +25,7 @@
 #include <Qsci/qscilexer.h>
 
 
-class QSCINTILLA_EXPORT LexerOctaveGui : public QsciLexer
+class LexerOctaveGui : public QsciLexer
 {
     Q_OBJECT