- Fixed compilation of OMShell (changed paths in makefiles)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8117 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

OMShell/OMShellGUI/Makefile.unix.in

@@ -1,4 +1,4 @@
-top_builddir=../
+top_builddir=../../
 builddir_bin=$(top_builddir)/build/bin/
 builddir_share=$(top_builddir)/build/share/
 runtimedir=$(top_builddir)/Compiler/runtime/
@@ -25,8 +25,8 @@ $(NAME): Makefile OMShell.config omc_communication.cc
 
 build: $(NAME)
 	mkdir -p $(builddir_share)/omshell/
-	if [ "$(EXE)" = ".app" ]; then cp -rp $(NAME)$(EXE) ../build/Applications/ ; else cp -p $(NAME) $(builddir_bin); fi
-	cp -p ../OMNotebook/OMNotebookQT4/commands.xml $(builddir_share)/omshell/
+	if [ "$(EXE)" = ".app" ]; then cp -rp ../bin/$(NAME)$(EXE) ../build/Applications/ ; else cp -p ../bin/$(NAME) $(builddir_bin); fi
+	cp -p $(top_builddir)/OMNotebook/OMNotebookGUI/commands.xml $(builddir_share)/omshell/
 
 Makefile.unix: Makefile.unix.in
 	cd $(top_builddir); ./config.status

OMShell/OMShellGUI/OMShellGUI.pro

@@ -23,15 +23,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
 } else {
   include(OMShell.config)
 }
 #---------End OMNIorb
 
 INCLUDEPATH += $${CORBAINC}
-LIBS += -L$${CORBALIBS} -lomniORB414_rt \
-        -lomnithread34_rt
+LIBS += $${CORBALIBS}
 
 CONFIG += warn_off
 

OMShell/OMShellGUI/omcinteractiveenvironment.cpp

@@ -38,7 +38,7 @@
 #include <QtGui/QMessageBox>
 
 #include "omcinteractiveenvironment.h"
-//#include "../Compiler/runtime/config.h"
+#include "../../Compiler/runtime/config.h"
 
 using namespace std;