Skip to content

Commit

Permalink
- fixes of OMShell, ext and OMNotebook for Linux (Ubuntu 8.10)
Browse files Browse the repository at this point in the history
  + a lot of #include <typeinfo> were needed
  + updates in *.pro on how coin-config and soqt-config are used


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3722 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 31, 2008
1 parent aa59156 commit 1acbf66
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions OMShell/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: OMShell
# Generated by qmake (2.01a) (Qt 4.3.4) on: Fri Oct 3 01:47:02 2008
# Generated by qmake (2.01a) (Qt 4.4.3) on: Fri Oct 31 06:57:57 2008
# Project: OMShell.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile OMShell.pro
Expand All @@ -10,13 +10,13 @@

CC = gcc
CXX = g++
DEFINES = -DQT_SHARED -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -fpermissive -g -Wall -W -D_REENTRANT $(DEFINES)
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../../mico/include -I. -I.
LINK = g++
LFLAGS = -Wl,--no-undefined
LIBS = $(SUBLIBS) -L/usr/lib -L/home/openmodelica/dev/mico/lib -lmico2.3.12 -lm -lpthread -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
LIBS = $(SUBLIBS) -L/usr/lib `mico-config --libs` -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/bin/qmake
Expand Down Expand Up @@ -69,7 +69,7 @@ DIST = /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/debug.prf \
/usr/share/qt4/mkspecs/features/release.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
Expand Down Expand Up @@ -119,7 +119,7 @@ Makefile: OMShell.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/debug.prf \
/usr/share/qt4/mkspecs/features/release.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
Expand All @@ -128,7 +128,11 @@ Makefile: OMShell.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/features/resources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \
/usr/share/qt4/mkspecs/features/lex.prf
/usr/share/qt4/mkspecs/features/lex.prf \
/usr/lib/libQtXml.prl \
/usr/lib/libQtGui.prl \
/usr/lib/libQtNetwork.prl \
/usr/lib/libQtCore.prl
$(QMAKE) -unix -o Makefile OMShell.pro
/usr/share/qt4/mkspecs/common/g++.conf:
/usr/share/qt4/mkspecs/common/unix.conf:
Expand All @@ -138,7 +142,7 @@ Makefile: OMShell.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/features/qt_config.prf:
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
/usr/share/qt4/mkspecs/features/default_pre.prf:
/usr/share/qt4/mkspecs/features/debug.prf:
/usr/share/qt4/mkspecs/features/release.prf:
/usr/share/qt4/mkspecs/features/default_post.prf:
/usr/share/qt4/mkspecs/features/warn_on.prf:
/usr/share/qt4/mkspecs/features/qt.prf:
Expand All @@ -148,6 +152,10 @@ Makefile: OMShell.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/features/uic.prf:
/usr/share/qt4/mkspecs/features/yacc.prf:
/usr/share/qt4/mkspecs/features/lex.prf:
/usr/lib/libQtXml.prl:
/usr/lib/libQtGui.prl:
/usr/lib/libQtNetwork.prl:
/usr/lib/libQtCore.prl:
qmake: FORCE
@$(QMAKE) -unix -o Makefile OMShell.pro

Expand Down

0 comments on commit 1acbf66

Please sign in to comment.