- renamed OpenModelica1.5.0 to trunk

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

OMShell/Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: OMShell
-# Generated by qmake (2.01a) (Qt 4.4.3) on: sø. nov. 2 16:34:51 2008
+# Generated by qmake (2.01a) (Qt 4.5.0) on: Mon Oct 12 08:39:22 2009
 # Project:  OMShell.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile OMShell.pro
@@ -13,9 +13,9 @@ CXX           = g++
 DEFINES       = -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtXml -I/usr/include/qt4 -I/usr/local/include -I. -I.
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4 -I/usr/local/include -I. -I.
 LINK          = g++
-LFLAGS        = -Wl,--no-undefined
+LFLAGS        = -Wl,-O1
 LIBS          = $(SUBLIBS)  -L/usr/lib -rdynamic -L/usr/local/lib -lmico2.3.13 -lssl -lcrypto -ldl -lm -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
 AR            = ar cqs
 RANLIB        = 

mosh/src/Makefile.in

@@ -27,8 +27,7 @@ CORBAHOME = @CORBAHOME@
 
 ifdef USE_CORBA
   CORBAIMPL = -I$(top_builddir)/Compiler/runtime
-  CORBAOBJS = $(top_builddir)/Compiler/runtime/omc_communication.o \
-	$(top_builddir)/Compiler/runtime/omc_communication_impl.o
+  CORBAOBJS = $(top_builddir)/Compiler/runtime/omc_communication.o #$(top_builddir)/Compiler/runtime/omc_communication_impl.o
   CORBALIB = `mico-config --libs`
   CORBAINC = -I$(CORBAHOME)/include
 else

mosh/src/mosh.cpp

@@ -76,8 +76,10 @@ void doSocketCommunication(const string*);
 char* historyfile = "mosh_history";
 int maxhistoryfileentries = 3000;
 
+/* none of these are needed!
 
 pthread_mutex_t lock;
+pthread_mutex_t clientlock;
 
 // Condition variable for keeping omc waiting for client requests
 pthread_cond_t omc_waitformsg;
@@ -89,6 +91,12 @@ pthread_cond_t corba_waitformsg;
 pthread_mutex_t corba_waitlock;
 bool corba_waiting=false;
 
+// we need to define these too.
+char* omc_cmd_message;
+char* omc_reply_message;
+
+*/
+
 /* Main function, handles options: -noserv -corba
    and calls appropriate function. */
 int main(int argc, char* argv[])