Changeset 31920 in project


Ignore:
Timestamp:
11/27/14 12:57:28 (5 years ago)
Author:
felix winkelmann
Message:

qt-light 0.99: added contributions by Jeremey Farnaud (improved Mac OS support)

Location:
release/4/qt-light
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • release/4/qt-light/tags/0.99/chicken-compile-qt-extension.scm

    r22288 r31920  
    1717      (and (file-execute-access? "/usr/bin/qmake") "/usr")
    1818      (and (file-execute-access? "/usr/local/bin/qmake") "/usr/local")
     19      (and (file-execute-access? "/opt/local/bin/qmake") "/opt/local")
    1920      (quit "please set the QTDIR environment variable") ) )
    2021
     
    2930(define qmake (make-pathname QTDIR "bin/qmake"))
    3031(define mingw32 (eq? (build-platform) 'mingw32))
     32(define macosx (eq? (software-version) 'macosx))
    3133(define outfile #f)
     34
     35(define install_name_tool
     36  (and macosx
     37       "/usr/bin/install_name_tool"))
    3238
    3339(define gmake
     
    109115      (if mingw32 "release" #f)
    110116      (if mingw32 name (string-append "lib" name))
    111       (if mingw32 "dll" "so.1.0.0"))
     117      (cond (mingw32 "dll")
     118            (macosx "1.0.0.dylib")
     119            (else "so.1.0.0")))
    112120     output)
     121    (when macosx
     122      (run (,install_name_tool -change "libchicken.dylib" ,(make-pathname libpath "libchicken" "dylib") ,output)))
    113123    ) )
    114124
  • release/4/qt-light/tags/0.99/qt-light.setup

    r24071 r31920  
    1111(install-extension
    1212 'qt-light
    13  `("qt-light.so" "qt-light.import.so")
    14  '((version 0.98)))
     13 '("qt-light.so" "qt-light.import.so"))
    1514
    1615(compile -O3 -d0 -b chicken-compile-qt-extension.scm)
     
    1817(install-program
    1918 'chicken-compile-qt-extension
    20  '("chicken-compile-qt-extension")
    21  '((version 0.98)))
     19 '("chicken-compile-qt-extension"))
  • release/4/qt-light/trunk/chicken-compile-qt-extension.scm

    r22288 r31920  
    1717      (and (file-execute-access? "/usr/bin/qmake") "/usr")
    1818      (and (file-execute-access? "/usr/local/bin/qmake") "/usr/local")
     19      (and (file-execute-access? "/opt/local/bin/qmake") "/opt/local")
    1920      (quit "please set the QTDIR environment variable") ) )
    2021
     
    2930(define qmake (make-pathname QTDIR "bin/qmake"))
    3031(define mingw32 (eq? (build-platform) 'mingw32))
     32(define macosx (eq? (software-version) 'macosx))
    3133(define outfile #f)
     34
     35(define install_name_tool
     36  (and macosx
     37       "/usr/bin/install_name_tool"))
    3238
    3339(define gmake
     
    109115      (if mingw32 "release" #f)
    110116      (if mingw32 name (string-append "lib" name))
    111       (if mingw32 "dll" "so.1.0.0"))
     117      (cond (mingw32 "dll")
     118            (macosx "1.0.0.dylib")
     119            (else "so.1.0.0")))
    112120     output)
     121    (when macosx
     122      (run (,install_name_tool -change "libchicken.dylib" ,(make-pathname libpath "libchicken" "dylib") ,output)))
    113123    ) )
    114124
  • release/4/qt-light/trunk/qt-light.setup

    r24071 r31920  
    1111(install-extension
    1212 'qt-light
    13  `("qt-light.so" "qt-light.import.so")
    14  '((version 0.98)))
     13 '("qt-light.so" "qt-light.import.so"))
    1514
    1615(compile -O3 -d0 -b chicken-compile-qt-extension.scm)
     
    1817(install-program
    1918 'chicken-compile-qt-extension
    20  '("chicken-compile-qt-extension")
    21  '((version 0.98)))
     19 '("chicken-compile-qt-extension"))
Note: See TracChangeset for help on using the changeset viewer.