- Fixed compilation of OMNotebook

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8118 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 6, 2011 · bc015ef · bc015ef
1 parent 4ab4fad
commit bc015ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/OMNotebook/OMNotebookGUI/Makefile.unix.in b/OMNotebook/OMNotebookGUI/Makefile.unix.in
@@ -25,7 +25,7 @@ $(NAME): Makefile OMNotebook.config omc_communication.cc
 
 build: $(NAME)
 	mkdir -p $(builddir_share)/omnotebook/drmodelica/ $(builddir_share)/omnotebook/drcontrol/
-	if [ "$(EXE)" = ".app" ]; then cp -rp $(NAME)$(EXE) ../../build/Applications/ ; else cp -p $(NAME) $(builddir_bin)/$(NAME); fi
+	if [ "$(EXE)" = ".app" ]; then cp -rp ../bin/$(NAME)$(EXE) ../../build/Applications/ ; else cp -p ../bin/$(NAME) $(builddir_bin)/$(NAME); fi
 	cp -p *.xml $(builddir_share)/omnotebook/
 	cp -p OMNotebookHelp.onb $(builddir_share)/omnotebook/
 	(DRMODELICAPWD=`cd ../DrModelica/ && pwd` && \

diff --git a/OMNotebook/OMNotebookGUI/OMNotebookGUI.pro b/OMNotebook/OMNotebookGUI/OMNotebookGUI.pro
@@ -153,15 +153,14 @@ win32 {
              __OSVERSION__=4 \
              __WIN32__
   CORBAINC = $$(OMDEV)/lib/omniORB-4.1.4-mingw/include
-  CORBALIBS = $$(OMDEV)/lib/omniORB-4.1.4-mingw/lib/x86_win32
+  CORBALIBS = -L$$(OMDEV)/lib/omniORB-4.1.4-mingw/lib/x86_win32 -lomniORB414_rt -lomnithread34_rt
   DEFINES += USE_OMNIORB
 } else {
   include(OMNotebook.config)
 }
 #---------End OMNIorb
 
-LIBS += -L$${CORBALIBS} -lomniORB414_rt \
-        -lomnithread34_rt
+LIBS += $${CORBALIBS}
 INCLUDEPATH += $${CORBAINC} \
                ../Pltpkg2 \
                ../3Dpkg

diff --git a/OMNotebook/OMNotebookGUI/graphcell.cpp b/OMNotebook/OMNotebookGUI/graphcell.cpp
@@ -151,7 +151,7 @@ namespace IAEX {
 
     emit clickOnCell();
     updatePosition();
-    if(state != ERROR)
+    if(state != Error)
       emit setState(Modified);
 
 
@@ -432,7 +432,7 @@ namespace IAEX {
       QTextBrowser::insertFromMimeData( source );
 
     updatePosition();
-    if(state != ERROR)
+    if(state != Error)
       emit setState(Modified);
   }
 
@@ -1638,7 +1638,7 @@ namespace IAEX {
                   output_->selectAll();
                   output_->textCursor().insertText( "[Error] Unable to read plot image \"" +
                     filename1 + "or " + filename2 + "\". Please retry." );
-                  setState(ERROR);
+                  setState(Error);
                   break;
                 }
               }
@@ -1649,7 +1649,7 @@ namespace IAEX {
               output_->selectAll();
               output_->textCursor().insertText( "[Error] Unable to find plot image \"" +
                 filename1 + " or " + filename2  + "\"" );
-              setState(ERROR);
+              setState(Error);
               break;
             }
 
@@ -1669,7 +1669,7 @@ namespace IAEX {
           {
             res += QString("\n") + error;
             // palette.setColor(input_->backgroundRole(), QColor(200,00,00));
-            setState(ERROR);
+            setState(Error);
           }
           else
             setState(Finished);
@@ -1726,7 +1726,7 @@ namespace IAEX {
 
     if( !error.isEmpty() && error.size() != 0)
     {
-      setState(ERROR);
+      setState(Error);
       res += QString("\n") + error;
     }
     else