##// END OF EJS Templates
Sync
Alexis Jeandet -
r2:96ca05441d7d default
parent child
Show More
@@ -34,7 +34,6 macx {
34 win32:INCLUDEPATH += $$PYTHON_PATH/PC $$PYTHON_PATH/include
34 win32:INCLUDEPATH += $$PYTHON_PATH/PC $$PYTHON_PATH/include
35 win32-msvc*:LIBS += $$PYTHON_LIB/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
35 win32-msvc*:LIBS += $$PYTHON_LIB/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
36 win32-g++:LIBS += $$PYTHON_PATH/libs/libpython$${PYTHON_VERSION}.a
36 win32-g++:LIBS += $$PYTHON_PATH/libs/libpython$${PYTHON_VERSION}.a
37
38 } else:unix {
37 } else:unix {
39 # on linux, python-config is used to autodetect Python.
38 # on linux, python-config is used to autodetect Python.
40 # make sure that you have installed a matching python-dev package.
39 # make sure that you have installed a matching python-dev package.
@@ -64,8 +64,7 CONFIG(debug, debug|release) {
64 ########################################################################################
64 ########################################################################################
65 contains(CONFIG,BUILDING_QTALL){
65 contains(CONFIG,BUILDING_QTALL){
66 message("BUILDING_QTALL")
66 message("BUILDING_QTALL")
67 }
67 } else {
68 !contains(CONFIG,BUILDING_QTALL){
69 win32::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
68 win32::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
70 unix::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
69 unix::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
71 }
70 }
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now