diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-14 17:49:23 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-14 17:49:23 (GMT) |
| commit | a3aa61bab2c88fce649a9515dec0ddb7d15be085 (patch) | |
| tree | 83466a5f06563d161395e3fc253ce07f8f21d6da /glib-2.0.pri | |
| parent | b54a8a42e8d5fe09115cca46b1256598ed39dbc4 (diff) | |
bugfix: glib include fix
Diffstat (limited to 'glib-2.0.pri')
| -rw-r--r-- | glib-2.0.pri | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/glib-2.0.pri b/glib-2.0.pri index 0fbc4e2..2f293bf 100644 --- a/glib-2.0.pri +++ b/glib-2.0.pri @@ -7,14 +7,13 @@ # 3. system's standard include paths from pkg-config glib-2.0 { - # read environment variables OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES) GLIB2_DIR = $$(GLIB2DIR) !isEmpty(OPENSCAD_LIBRARIES_DIR) { isEmpty(GLIB2_INCLUDEPATH) { - GLIB2_INCLUDEPATH_1 = $$OPENSCAD_LIBRARIES_DIR/include/glib-2.0 + GLIB2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/glib-2.0 GLIB2_INCLUDEPATH_2 = $$OPENSCAD_LIBRARIES_DIR/lib/glib-2.0/include GLIB2_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib } @@ -23,7 +22,7 @@ GLIB2_DIR = $$(GLIB2DIR) isEmpty(GLIB2_INCLUDEPATH) { GLIB2_CFLAGS = $$system("pkg-config --cflags glib-2.0") } else { - GLIB2_CFLAGS = -I$$GLIB2_INCLUDEPATH_1 + GLIB2_CFLAGS = -I$$GLIB2_INCLUDEPATH GLIB2_CFLAGS += -I$$GLIB2_INCLUDEPATH_2 } @@ -35,4 +34,6 @@ isEmpty(GLIB2_LIBPATH) { QMAKE_CXXFLAGS += $$GLIB2_CFLAGS LIBS += $$GLIB2_LIBS + +message("glib: $$GLIB2_CFLAGS") } |