Skip to content

Commit

Permalink
- renamed OMNotebook/OMNotebookQT4/trunk.pro to OMNotebook.pro
Browse files Browse the repository at this point in the history
- more modifications to Qt projects to get rid of hardcoded paths


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3725 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 31, 2008
1 parent 226cf7a commit 86ce085
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions OMShell/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: OMShell
# Generated by qmake (2.01a) (Qt 4.4.3) on: Fri Oct 31 08:01:10 2008
# Generated by qmake (2.01a) (Qt 4.4.3) on: Fri Oct 31 13:05:34 2008
# Project: OMShell.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile OMShell.pro
Expand All @@ -16,7 +16,7 @@ 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 `mico-config --libs` -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
LIBS = $(SUBLIBS) -L/usr/lib -rdynamic -L/home/openmodelica/dev/mico/lib -lmico2.3.13 -lssl -lcrypto -ldl -lm -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/bin/qmake
Expand Down
6 changes: 4 additions & 2 deletions OMShell/OMShell.pro
@@ -1,8 +1,10 @@
TEMPLATE = app

DEPENDPATH += .
INCLUDEPATH += /home/openmodelica/dev/mico/include
LIBS+= `mico-config --libs`
MICOHOME = $$system(mico-config --prefix)
INCLUDEPATH += $${MICOHOME}/include
MICO_LIBS = $$system(mico-config --libs)
LIBS+= $${MICO_LIBS}
CONFIG += warn_on
QT += network xml

Expand Down

0 comments on commit 86ce085

Please sign in to comment.