Project

General

Profile

pkg-config-on-cross.patch

patch for pkg-config stored in variable - johnnywho, 2015-08-24 23:21

View differences:

doomsday-1.14.0-new/doomsday/dep_opengl.pri 2015-08-24 17:55:43.849192121 +0300
18 18
}
19 19
else {
20 20
    # Generic Unix.
21
    LIBS += $$system(pkg-config --libs gl)
22
    INCLUDEPATH += $$system(pkg-config --cflags gl)
21
    LIBS += $$system(${PKG_CONFIG} --libs gl)
22
    INCLUDEPATH += $$system(${PKG_CONFIG} --cflags gl)
23 23

  
24 24
    # An additional include path for user's GL headers.
25 25
    !isEmpty(OPENGL_DIR): INCLUDEPATH = $$OPENGL_DIR $$INCLUDEPATH
doomsday-1.14.0-new/doomsday/dep_sdl.pri 2015-08-24 18:32:16.499842751 +0300
29 29
}
30 30
else {
31 31
    # Generic Unix.
32
    sdlflags = $$system(pkg-config sdl --cflags)
32
    sdlflags = $$system(${PKG_CONFIG} sdl --cflags)
33 33
    QMAKE_CFLAGS += $$sdlflags
34 34
    QMAKE_CXXFLAGS += $$sdlflags
35
    LIBS += $$system(pkg-config sdl --libs)
35
    LIBS += $$system(${PKG_CONFIG} sdl --libs)
36 36
}
37 37

  
38 38
# Should we include SDL_mixer in the build, too?
doomsday-1.14.0-new/doomsday/dep_zlib.pri 2015-08-24 18:30:58.460469785 +0300
14 14
}
15 15
else {
16 16
    # Generic Unix.
17
    QMAKE_CFLAGS += $$system(pkg-config zlib --cflags)
18
    LIBS += $$system(pkg-config zlib --libs)
17
    QMAKE_CFLAGS += $$system(${PKG_CONFIG} zlib --cflags)
18
    LIBS += $$system(${PKG_CONFIG} zlib --libs)
19 19
}
doomsday-1.14.0-new/doomsday/libgui/libgui.pro 2015-08-24 17:54:02.661856364 +0300
32 32
    # DisplayMode uses the Xrandr and XFree86-VideoMode extensions.
33 33
    !deng_nodisplaymode {
34 34
        # Check that the X11 extensions exist.
35
        !system(pkg-config --exists xxf86vm) {
35
        !system(${PKG_CONFIG} --exists xxf86vm) {
36 36
            error(Missing dependency: X11 XFree86 video mode extension library (development headers). Alternatively disable display mode functionality with: CONFIG+=deng_nodisplaymode)
37 37
        }
38
        !system(pkg-config --exists xrandr) {
38
        !system(${PKG_CONFIG} --exists xrandr) {
39 39
            error(Missing dependency: X11 RandR extension library (development headers). Alternatively disable display mode functionality with: CONFIG+=deng_nodisplaymode)
40 40
        }
41 41

  
42
        QMAKE_CXXFLAGS += $$system(pkg-config xrandr xxf86vm --cflags)
43
                  LIBS += $$system(pkg-config xrandr xxf86vm --libs)
42
        QMAKE_CXXFLAGS += $$system(${PKG_CONFIG} xrandr xxf86vm --cflags)
43
                  LIBS += $$system(${PKG_CONFIG} xrandr xxf86vm --libs)
44 44
    }
45 45
}
46 46