Changeset 9046:d16639ba10c5 in orange


Ignore:
Timestamp:
09/30/11 12:42:25 (3 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
bee548a7f30768fa922c4331c297f67834c4fbd9
Message:

Fixed setup.py script (wrong libraries argument for orange extension when linking external libs).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/setup.py

    r9041 r9046  
    3838 
    3939if sys.platform == "darwin": 
    40     extra_compile_args = "-fPIC -fpermissive -fno-common -w -DDARWIN ".split() 
    41     extra_link_args = "-headerpad_max_install_names -undefined dynamic_lookup -lstdc++ -lorange_include".split() 
     40    extra_compile_args = "-fPIC -fpermissive -fno-common -w -DDARWIN".split() 
     41    extra_link_args = "-headerpad_max_install_names -undefined dynamic_lookup".split() 
    4242elif sys.platform == "win32": 
    4343    extra_compile_args = ["-EHsc"] 
     
    4646    extra_compile_args = "-fPIC -fpermissive -w -DLINUX".split() 
    4747    extra_link_args = ["-Wl,-R$ORIGIN"]     
    48 #    extra_link_args = ["-Wl,-R'$ORIGIN'"] #use this if distutils runs commands though the shell 
    4948else: 
    5049    extra_compile_args = [] 
     
    414413                                      extra_compile_args = extra_compile_args + ["-DORANGE_EXPORTS"], 
    415414                                      extra_link_args = extra_link_args, 
    416                                       libraries=libraries, 
     415                                      libraries=orange_libraries, 
    417416                                      extra_pyxtract_cmds = ["../pyxtract/defvectors.py"], 
    418417#                                      depends=["orange/ppp/lists"] 
Note: See TracChangeset for help on using the changeset viewer.