Changeset 8984:bf2c7d6854e4 in orange


Ignore:
Timestamp:
09/19/11 17:09:16 (3 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
c3a982d81ad539655fef3abeb8e99ebfec7d2d09
Message:

Added STATICCOMPILEOPTIONS define to makefile.defs for use in include/Makefile.
Fixes #950.

Location:
source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/include/Makefile

    r3569 r8984  
    55-include makefile.deps 
    66 
     7# Redifine the build rule to use STATICCOMPILEOPTIONS 
     8obj/%.o : %.cpp 
     9    $(COMPILER) $(STATICCOMPILEOPTIONS) -c $< -o $@ 
     10     
    711$(OLD)/liborange_include.a: $(INCLUDE_OBJECTS) 
    812    ar -r $(OLD)/liborange_include.a $(INCLUDE_OBJECTS) 
  • source/makefile.defs

    r8945 r8984  
    3636  endif 
    3737  COMPILEOPTIONS = -fPIC -fpermissive -fno-common -w -DDARWIN -D$(MODULENAME)_EXPORTS -O3 -I$(NUMPY_INCLUDE) $(CXXFLAGS) 
     38  STATICCOMPILEOPTIONS = -fpermissive -fno-common -w -DDARWIN -D$(MODULENAME)_EXPORTS -O3 -I$(NUMPY_INCLUDE) $(CXXFLAGS) 
    3839  LINKOPTIONS = -dynamiclib -headerpad_max_install_names -undefined dynamic_lookup -lstdc++ -L$(OLD) -lorange_include $(LDFLAGS) 
    3940  LINKER = g++ 
     
    4142ifeq ($(OS), FreeBSD) 
    4243  COMPILEOPTIONS = -fPIC -fpermissive -w -DFREEBSD -O3 $(CXXFLAGS) 
     44  STATICCOMPILEOPTIONS = -fpermissive -w -DFREEBSD -O3 $(CXXFLAGS) 
    4345  LINKOPTIONS = -shared -lstdc++ -L$(OLD) -lorange_include $(LDFLAGS) 
    4446  LINKOPTIONS += `gsl-config --libs` 
     
    4749  # for icc, also add -D"__sync_fetch_and_add(ptr,addend)=_InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(ptr)), addend)" 
    4850  COMPILEOPTIONS = -fPIC -fpermissive -w -DLINUX -D$(MODULENAME)_EXPORTS -O3 $(CXXFLAGS) 
     51  STATICCOMPILEOPTIONS = -fpermissive -w -DLINUX -D$(MODULENAME)_EXPORTS -O3 $(CXXFLAGS) # To make Debian package managers happy 
    4952  LINKOPTIONS = -Wl,-R'$$ORIGIN' -shared -lstdc++ -L$(OLD) -lorange_include $(LDFLAGS) 
    5053endif 
Note: See TracChangeset for help on using the changeset viewer.