- OMPlot now compiles on Linux

- Made OMPlot not crash if too few arguments are given git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8183 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 11, 2011 · 98628c0 · 98628c0
1 parent f149e16
commit 98628c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/OMPlot/OMPlotGUI/Makefile.unix.in b/OMPlot/OMPlotGUI/Makefile.unix.in
@@ -21,11 +21,11 @@ $(NAME)$(EXE): Makefile
 	make -f Makefile
 ifeq ($(EXE),.app)
 $(NAME): $(NAME)$(EXE) always
-	cp -p $</Contents/MacOS/$(NAME) $@
+	cp -p ../bin/$</Contents/MacOS/$(NAME) ../bin/$@
 endif
 
 build: $(NAME)
-	cp -p $(NAME) $(builddir_bin)
+	cp -p ../bin/$(NAME) $(builddir_bin)
 
 Makefile.unix: Makefile.unix.in
 	cd $(top_builddir); ./config.status
diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.config.in b/OMPlot/OMPlotGUI/OMPlotGUI.config.in
@@ -1,2 +1,2 @@
-LIBS += -lqwt
+LIBS += -lqwt@with_qwt_suffix@
 INCLUDEPATH += @with_qwt@
diff --git a/OMPlot/OMPlotGUI/main.cpp b/OMPlot/OMPlotGUI/main.cpp
@@ -35,6 +35,10 @@
 
 int main(int argc, char *argv[])
 {
+    if (argc < 14) {
+      printf("Usage: %s arg1 ... arg13 variables\n", *argv);
+      return 1;
+    }
     QApplication a(argc, argv);
 
     try {
@@ -55,6 +59,6 @@ int main(int argc, char *argv[])
         msgBox->setDefaultButton(QMessageBox::Ok);
         msgBox->exec();
 
-        return -1;
+        return 1;
     }    
 }