- Unix compilation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10463 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 12, 2011 · 3b02655 · 3b02655
1 parent c027860
commit 3b02655
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/SimulationRuntime/c/ModelicaExternalC/Makefile.in b/SimulationRuntime/c/ModelicaExternalC/Makefile.in
@@ -1,14 +1,14 @@
 CC = @CC@
 CXX = @CXX@
 CFLAGS   := @CFLAGS@
-CPPFLAGS := @CPPFLAGS@ -I.. -Dlinux -Dstatic= -I../util/
+CPPFLAGS := @CPPFLAGS@ -I.. -Dlinux -Dstatic=
 OBJS = ModelicaInternal.o ModelicaStrings.o ModelicaTablesImpl.o ModelicaUtilities.o tables.o
 AR = ar -ru
 
 all: libModelicaExternalC.a
 
 tables.o: tables.cpp tables.h
-	$(CXX) $(CFLAGS) -o $@ -c $<
+	$(CXX) $(CFLAGS) @CPPFLAGS@ -I../util -o $@ -c $<
 
 libModelicaExternalC.a : $(OBJS)
 	$(AR) $@ $(OBJS)

diff --git a/SimulationRuntime/c/ModelicaExternalC/tables.h b/SimulationRuntime/c/ModelicaExternalC/tables.h
@@ -39,8 +39,8 @@
  *
  */
 
-#ifndef _OMC_TAPLES_H
-#define _OMC_TAPLES_H
+#ifndef _OMC_TABLES_H
+#define _OMC_TABLES_H
 
 #ifdef __cplusplus
 extern "C"

diff --git a/SimulationRuntime/c/simulation/solver/Makefile.in b/SimulationRuntime/c/simulation/solver/Makefile.in
@@ -5,9 +5,10 @@
 # for both UNIX/Linux and Windows platforms.
 
 CC = @CC@
+CXX = @CXX@
 ANSI= #-ansi
 CFLAGS   := @CFLAGS@ -Wall $(ANSI) -pedantic $(EXTRA_CFLAGS) -mfpmath=sse -c -I..
-CPPFLAGS := @CPPFLAGS@ -Wall $(ANSI) $(EXTRA_CFLAGS) -I. -I.. -I../../ -I../../util -I../../linearization -I../results -I../math-support/
+CPPFLAGS := @CPPFLAGS@ -Wall $(ANSI) $(EXTRA_CFLAGS) -I. -I.. -I../../ -I../../util -I../../linearization -I../results -I../../math-support/
 AR = ar -ru
 FFLAGS  = -O -fexceptions
 

diff --git a/SimulationRuntime/interactive/Makefile.in b/SimulationRuntime/interactive/Makefile.in
@@ -12,7 +12,7 @@ CC = @CC@
 CXX = @CXX@
 CFLAGS	+= @CFLAGS@
 CXXFLAGS = $(CFLAGS) 
-CPPFLAGS = -I.. -Wall -I../c/simulation/results/ -I../c/linearization -I../c/simulation/solver/ -I../c/util/ -I../c/ -I../c/simulation/ -I../c/simulation/math-support
+CPPFLAGS = -I.. -Wall -I../c/simulation/results/ -I../c/linearization -I../c/simulation/solver/ -I../c/util/ -I../c/ -I../c/simulation/ -I../c/simulation
 
 OBJ = $(CPPSRC:.cpp=.o)
 
@@ -29,7 +29,7 @@ libinteractive.a : $(OBJ)
 
 client : client.cpp socket.h socket.cpp socket_win.cpp socket_unix.cpp thread.h thread.cpp
 	echo "Building client for interactive simulation ... "
-	g++ $(CPPFLAGS) -o SampleClient/client client.cpp socket.cpp thread.cpp -lpthread
+	$(CXX) $(CPPFLAGS) -o SampleClient/client client.cpp socket.cpp thread.cpp -lpthread
 
 clean:
 	$(RM) -rf *.o *.a SampleClient/client