Changeset 20045 in osm for applications/editors/josm


Ignore:
Timestamp:
2010-02-17T17:10:45+01:00 (15 years ago)
Author:
stoecker
Message:

build fixes for webkit-image

Location:
applications/editors/josm/plugins/wmsplugin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/wmsplugin/Makefile

    r16592 r20045  
    11#!/usr/bin/make
    22
    3 MOC=moc
    4 #MOC=/usr/share/qt4/bin/moc
    5 CFLAGS =
    6 LDFLAGS =
    7 LDLIBS = `pkg-config --libs --cflags QtCore QtGui QtWebKit`
     3ifneq ($(windir),)
     4MINGWPATH = C:\\PROGRA~1\\mingw\\bin\\
     5QTPATH    = C:\\PROGRA~1\\qt\\
     6
     7CPP       = ${MINGWPATH}c++.exe
     8MOC       = ${QTPATH}bin\\moc.exe
     9RM        = del
     10CFLAGS    = -W -O2 -I${QTPATH}include
     11LDFLAGS   = -L${QTPATH}lib
     12LDLIBS    = -lQtCore4 -lQtWebKit4 -lQtGui4 -lQtNetwork4
     13else
     14MOC       = moc
     15#MOC       = /usr/share/qt4/bin/moc
     16CPP       = gcc
     17
     18PACKAGES  = QtCore QtGui QtWebKit QtNetwork
     19CFLAGS    = -W -O2 `pkg-config --cflags ${PACKAGES}`
     20LDFLAGS   = `pkg-config --libs-only-L ${PACKAGES}`
     21LDLIBS    = `pkg-config --libs-only-l ${PACKAGES}`
     22endif
    823
    924webkit-image: webkit-image.cpp webkit-image.h
    10         g++ -W -o $@ -O2 $(CFLAGS) $(LDFLAGS) webkit-image.cpp $(LDLIBS)
     25        $(CPP) -o $@ $(CFLAGS) $(LDFLAGS) webkit-image.cpp $(LDLIBS)
    1126
    1227webkit-image.h: webkit-image.cpp
    … …  
    1429
    1530clean:
    16         rm -f *.o webkit-image webkit-image.h
     31        ${RM} *.o webkit-image webkit-image.h

  • applications/editors/josm/plugins/wmsplugin/webkit-image.cpp

    r19704 r20045  
    1 /* compile with
    2 moc webkit-image.cpp >webkit-image.h
    3 g++ webkit-image.cpp -o webkit-image -lQtCore -lQtWebKit -lQtGui -s -O2
    4 or under Windows:
    5 g++ webkit-image.cpp -o webkit-image -lQtCore4 -lQtWebKit4 -lQtGui4 -s O2
    6 adding the correct directories with -L or -I:
    7 -I C:\Progra~1\Qt\include -L C:\Progra~1\Qt\lib
    8 */
    91#include <QtGui/QApplication>
    102#include <QtGui/QPainter>
    … …  
    179#include <QtCore/QProcess>
    1810#if QT_VERSION >= 0x040500
    19 #include <QDesktopServices>
    20 #include <QNetworkDiskCache>
     11#include <QtGui/QDesktopServices>
     12#include <QtNetwork/QNetworkDiskCache>
    2113#endif
    2214
Note: See TracChangeset for help on using the changeset viewer.