Skip to content

Commit

Permalink
Fix compilation after git-svn conversion
Browse files Browse the repository at this point in the history
- Added qwt, man-pages, etc
  • Loading branch information
sjoelund committed May 2, 2015
1 parent 1e3d33b commit 4273b13
Show file tree
Hide file tree
Showing 223 changed files with 68,050 additions and 133 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
@@ -0,0 +1,11 @@
*.c text eol=native
*.cpp text eol=native
*.h text eol=native
*.m4 text eol=native
.gitattributes text eol=native
.gitignore text eol=native
*.md text eol=native
LICENSE text eol=native
configure.ac text eol=native
Makefile* text eol=native
*.pro text eol=native
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "common"]
path = common
url = ../OpenModelica-common.git
2 changes: 1 addition & 1 deletion OMPlot/OMPlotGUI/OMPlotGUI.config.in
Expand Up @@ -3,7 +3,7 @@ QMAKE_CXX = @CXX@
QMAKE_LINK = @CXX@

LIBS += -L ../../build/lib/@host_short@/omc -lomqwt @RPATH_QMAKE@
INCLUDEPATH += ../../3rdParty/qwt/src ../../3rdParty/gc/include
INCLUDEPATH += @OPENMODELICAHOME@/include/omc/qwt @OPENMODELICAHOME@/include/omc/c

QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@
QMAKE_CXXFLAGS = @CFLAGS@ @CPPFLAGS@
Expand Down
113 changes: 55 additions & 58 deletions OMPlot/OMPlotGUI/OMPlotGUI.pro
@@ -1,58 +1,55 @@
#-------------------------------------------------
#
# Project created by QtCreator 2011-02-01T16:47:11
#
#-------------------------------------------------

QT += core gui svg

TARGET = OMPlot
TEMPLATE = app
CONFIG += console

SOURCES += main.cpp

HEADERS += ../../SimulationRuntime/c/util/read_matlab4.h \
../../SimulationRuntime/c/util/libcsv.h \
../../SimulationRuntime/c/util/read_csv.h \
Plot.h \
PlotZoomer.h \
Legend.h \
PlotPanner.h \
PlotGrid.h \
ScaleDraw.h \
PlotCurve.h \
PlotWindow.h \
PlotApplication.h \
PlotWindowContainer.h \
PlotMainWindow.h

win32 {
QMAKE_LFLAGS += -enable-auto-import
CONFIG(debug, debug|release){
LIBS += -L../../build/lib/omc -lOMPlot -lomqwtd
}
else {
LIBS += -L../../build/lib/omc -lOMPlot -lomqwt
}
INCLUDEPATH += ../../3rdParty/qwt/build/include
} else {
include(OMPlotGUI.config)
LIBS += -lOMPlot
}

INCLUDEPATH += .

CONFIG += warn_off

DESTDIR = ../bin

UI_DIR = ../generatedfiles/ui

MOC_DIR = ../generatedfiles/moc

RCC_DIR = ../generatedfiles/rcc

RESOURCES += resource_omplot.qrc

RC_FILE = rc_omplot.rc
#-------------------------------------------------
#
# Project created by QtCreator 2011-02-01T16:47:11
#
#-------------------------------------------------

QT += core gui svg

TARGET = OMPlot
TEMPLATE = app
CONFIG += console

SOURCES += main.cpp

HEADERS += Plot.h \
PlotZoomer.h \
Legend.h \
PlotPanner.h \
PlotGrid.h \
ScaleDraw.h \
PlotCurve.h \
PlotWindow.h \
PlotApplication.h \
PlotWindowContainer.h \
PlotMainWindow.h

win32 {
QMAKE_LFLAGS += -enable-auto-import
CONFIG(debug, debug|release){
LIBS += -L../../build/lib/omc -lOMPlot -lomqwtd
}
else {
LIBS += -L../../build/lib/omc -lOMPlot -lomqwt
}
INCLUDEPATH += ../../3rdParty/qwt/build/include
} else {
include(OMPlotGUI.config)
LIBS += -lOMPlot
}

INCLUDEPATH += .

CONFIG += warn_off

DESTDIR = ../bin

UI_DIR = ../generatedfiles/ui

MOC_DIR = ../generatedfiles/moc

RCC_DIR = ../generatedfiles/rcc

RESOURCES += resource_omplot.qrc

RC_FILE = rc_omplot.rc
138 changes: 66 additions & 72 deletions OMPlot/OMPlotGUI/OMPlotLib.pro
@@ -1,72 +1,66 @@
#-------------------------------------------------
#
# Project created by QtCreator 2011-02-01T16:47:11
#
#-------------------------------------------------

QT += core gui svg

TARGET = OMPlot
TEMPLATE = lib

CONFIG += release
win32 {
CONFIG += staticlib
}
QMAKE_LFLAGS += -enable-auto-import

SOURCES += ../../SimulationRuntime/c/util/read_matlab4.c \
../../SimulationRuntime/c/util/libcsv.c \
../../SimulationRuntime/c/util/read_csv.cpp \
Plot.cpp \
PlotZoomer.cpp \
Legend.cpp \
PlotPanner.cpp \
PlotGrid.cpp \
ScaleDraw.cpp \
PlotCurve.cpp \
PlotWindow.cpp \
PlotApplication.cpp \
PlotWindowContainer.cpp \
PlotMainWindow.cpp

HEADERS += ../../SimulationRuntime/c/util/read_matlab4.h \
../../SimulationRuntime/c/util/libcsv.h \
../../SimulationRuntime/c/util/read_csv.h \
Plot.h \
PlotZoomer.h \
Legend.h \
PlotPanner.h \
PlotGrid.h \
ScaleDraw.h \
PlotCurve.h \
PlotWindow.h \
PlotApplication.h \
PlotWindowContainer.h \
PlotMainWindow.h

win32 {
CONFIG(debug, debug|release){
LIBS += -L../../build/lib/omc -lomqwtd
}
else {
LIBS += -L../../build/lib/omc -lomqwt
}
INCLUDEPATH += ../../3rdParty/qwt/build/include
} else {
include(OMPlotGUI.config)
}

INCLUDEPATH += .

CONFIG += warn_off

DESTDIR = ../bin

UI_DIR = ../generatedfiles/ui

MOC_DIR = ../generatedfiles/moc

RCC_DIR = ../generatedfiles/rcc

RESOURCES += resource_omplot.qrc
#-------------------------------------------------
#
# Project created by QtCreator 2011-02-01T16:47:11
#
#-------------------------------------------------

QT += core gui svg

TARGET = OMPlot
TEMPLATE = lib

CONFIG += release
win32 {
CONFIG += staticlib
}
QMAKE_LFLAGS += -enable-auto-import

SOURCES += Plot.cpp \
PlotZoomer.cpp \
Legend.cpp \
PlotPanner.cpp \
PlotGrid.cpp \
ScaleDraw.cpp \
PlotCurve.cpp \
PlotWindow.cpp \
PlotApplication.cpp \
PlotWindowContainer.cpp \
PlotMainWindow.cpp

HEADERS += Plot.h \
PlotZoomer.h \
Legend.h \
PlotPanner.h \
PlotGrid.h \
ScaleDraw.h \
PlotCurve.h \
PlotWindow.h \
PlotApplication.h \
PlotWindowContainer.h \
PlotMainWindow.h

win32 {
CONFIG(debug, debug|release){
LIBS += -L../../build/lib/omc -lomqwtd
}
else {
LIBS += -L../../build/lib/omc -lomqwt
}
INCLUDEPATH += ../../3rdParty/qwt/build/include
} else {
include(OMPlotGUI.config)
}

INCLUDEPATH += .

CONFIG += warn_off

DESTDIR = ../bin

UI_DIR = ../generatedfiles/ui

MOC_DIR = ../generatedfiles/moc

RCC_DIR = ../generatedfiles/rcc

RESOURCES += resource_omplot.qrc
4 changes: 4 additions & 0 deletions OMPlot/OMPlotGUI/PlotWindow.cpp
Expand Up @@ -1374,3 +1374,7 @@ void SetupDialog::applySetup()
// replot
mpPlotWindow->getPlot()->replot();
}

#include "util/read_matlab4.c"
#include "util/libcsv.c"
#include "util/read_csv.c"
4 changes: 2 additions & 2 deletions OMPlot/OMPlotGUI/PlotWindow.h
Expand Up @@ -40,8 +40,8 @@
#include <qwt_compat.h>
#endif
#include <stdexcept>
#include "../../SimulationRuntime/c/util/read_matlab4.h"
#include "../../SimulationRuntime/c/util/read_csv.h"
#include "util/read_matlab4.h"
#include "util/read_csv.h"
#include "Plot.h"

namespace OMPlot
Expand Down
1 change: 1 addition & 0 deletions common
Submodule common added at e3db36

0 comments on commit 4273b13

Please sign in to comment.