- Update makefiles to make parts of the qtclients compile on OSX

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7267 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 2, 2010 · 5e62d3e · 5e62d3e
1 parent 216f944
commit 5e62d3e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/OMEdit/OMEditGUI/Makefile.unix → OMEdit/OMEditGUI/Makefile.unix.in b/OMEdit/OMEditGUI/Makefile.unix → OMEdit/OMEditGUI/Makefile.unix.in
@@ -1,11 +1,19 @@
 .PHONY: install build OMEdit
 
+QMAKE=@QMAKE@
+
 install: build
 	cp ../bin/OMEdit ../../build/bin/
 	mkdir -p ../../build/share/doc/omedit/
 	cp -p ../docs/*.pdf ../../build/share/doc/omedit/
 OMEdit: build
-build:
+build: Makefile
 	ln -sf ../OMNotebook/3Dpkg ../
 	ln -sf ../OMNotebook/Pltpkg2 ../
-	qmake && $(MAKE) -f Makefile
+	$(MAKE) -f Makefile
+Makefile: OMEditGUI.pro OMEdit.config
+	$(QMAKE)
+Makefile.unix: Makefile.unix.in
+	(cd ../../; ./config.status)
+OMEdit.config: OMEdit.config.in
+	(cd ../../; ./config.status)
diff --git a/OMEdit/OMEditGUI/OMEdit.config.in b/OMEdit/OMEditGUI/OMEdit.config.in
@@ -0,0 +1,4 @@
+LIBS += @CORBALIBS@
+INCLUDEPATH += @CORBA_QMAKE_INCLUDES@
+
+QMAKE_LFLAGS += @LDFLAGS@
diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -82,8 +82,7 @@ LIBS += -LC:\\Thesis\\omniORB-4.1.4\\lib\\x86_win32 \
 
 INCLUDEPATH += C:\\Thesis\\omniORB-4.1.4\\include
 } else {
-LIBS += -L/usr/lib/ -lomniORB4 -lomnithread
-INCLUDEPATH += /usr/include/omniORB4
+    include(OMEdit.config)
 }
 #---------End OMNIorb