Revision 108:debead5f6bf8 noconfig.pri

View differences:

noconfig.pri
4 4
#CONFIG -= release
5 5
#CONFIG += debug
6 6

  
7
PREFIX_PATH = /usr/local
8

  
7 9
DEFINES += NDEBUG BUILD_RELEASE
8 10
DEFINES += NO_TIMING NO_HIT_COUNTS
9 11

  
......
28 30
# these.
29 31

  
30 32
LIBS += \
33
        -lbase \
31 34
        -lbz2 \
32 35
	-lrubberband \
33 36
	-lfftw3 \
......
54 57

  
55 58
    # This config is currently used for 32-bit Windows builds.
56 59

  
57
    INCLUDEPATH += sv-dependency-builds/win32-mingw/include
60
    INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include
58 61

  
59
    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib -L../sonic-visualiser/sv-dependency-builds/win32-mingw/lib
62
    LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib
60 63

  
61 64
    DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE
62 65

  
......
76 79
    # we want to do 32-bit builds with MSVC as well, then we'll
77 80
    # need to add a way to distinguish the two.
78 81
    
79
    INCLUDEPATH += sv-dependency-builds/win64-msvc/include
82
    INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include
80 83

  
81 84
## This seems to be intruding even when we're supposed to be release
82 85
#    CONFIG(debug) {
83 86
#        LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
84
#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \
85
#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
87
#            -L$$PWD/sv-dependency-builds/win64-msvc/lib/debug \
88
#            -L$$PWD/sv-dependency-builds/win64-msvc/lib
86 89
#    }
87 90
    CONFIG(release) {
88 91
        LIBS += -Lrelease \
89
            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
92
            -L$$PWD/sv-dependency-builds/win64-msvc/lib
90 93
    }
91 94

  
92 95
    DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE
......
111 114

  
112 115
    # All Mac builds are 64-bit these days.
113 116

  
114
    INCLUDEPATH += sv-dependency-builds/osx/include
115
    LIBS += -Lsv-dependency-builds/osx/lib
117
    INCLUDEPATH += $$PWD/sv-dependency-builds/osx/include
118
    LIBS += -L$$PWD/sv-dependency-builds/osx/lib -L$$PWD
116 119

  
117 120
    QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math
118 121

  

Also available in: Unified diff