Fixed some makefile issues.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@1063 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 9, 2004 · 2f3b181 · 2f3b181
1 parent 81e2e19
commit 2f3b181
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/modeq/Makefile.in b/modeq/Makefile.in
@@ -22,7 +22,7 @@ MYRML	= ./myrmlc
 
 
 LDFLAGS = -L$(RMLHOME)/lib/plain $(ANTLR_LIBP) -lrml -lm -lantlr $(LIBSOCKET) \
-	 -lssl -lmico -lcrypto -ldl -lm -lpthread 
+	 -lssl -lmico -lcrypto -lm -lpthread 
 
 PROG	= modeq
 AST	= absyn_builder/absyn_builder.a

diff --git a/modeq/runtime/Makefile.in b/modeq/runtime/Makefile.in
@@ -11,6 +11,7 @@ CFLAGS = @DEFS@
 
 SHELL	= /bin/sh
 CC	= gcc
+IDL	= idl --boa --no-poa
 CFLAGS	+= -I$(RMLINCLUDE) -I../../c_runtime
 CXXFLAGS = $(CFLAGS)
 SRC	= rtopts.c socketimpl.c printimpl.c systemimpl.c 
@@ -20,6 +21,11 @@ OBJ     = $(SRC:.c=.o) $(CPPSRC:.cpp=.o) $(CPPSRC:.cc=.o)
 
 all: $(OBJ)
 
+modeq_communication.cc modeq_communication.h : modeq_communication.idl
+	$(IDL) modeq_communication.idl
+
+modeq_communication.h: modeq_communication_impl.cpp corbaimpl.cpp
+
 clean:
 	$(RM) -rf *.o 
 

diff --git a/modeq/runtime/corbaimpl.cpp b/modeq/runtime/corbaimpl.cpp
@@ -126,7 +126,11 @@ RML_BEGIN_LABEL(Corba__close)
 {
   boa->deactivate_impl(CORBA::ImplementationDef::_nil());
   orb->shutdown(TRUE);
+#ifdef HAVE_PTHREAD_YIELD  
   pthread_yield(); // Allowing other thread to shutdown.
+#else
+  sched_yield(); // use as backup (in cygwin)
+#endif
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL