Changeset 1762 for branches/alma/src


Ignore:
Timestamp:
07/07/10 09:47:32 (14 years ago)
Author:
TakTsutsumi
Message:

New Development: No

JIRA Issue: No/Yes List JIRA ticket.

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Adjusted Makefile to compile on MacOSX


File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/alma/src/Makefile

    r1757 r1762  
    1717WCSLIBLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=WCSLIBLIBD eval_vars) && echo $$WCSLIBLIBD)
    1818WCSLIBLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=WCSLIBLIB eval_vars) && echo $$WCSLIBLIB)
     19PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
    1920PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
    2021PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
    2122PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
     23#PYTHONVER := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONVER eval_vars) && echo $$PYTHONVER)
    2224BOOSTROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=BOOSTROOT eval_vars) && echo $$BOOSTROOT)
     25RPFITSLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=RPFITSLIBD eval_vars) && echo $$RPFITSLIBD)
    2326
    2427CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
    2528CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
    26 USELIB := lib64
     29#USELIB := lib64
     30USELIB := lib
    2731
    2832# the compiler
     
    3438CXXFLAGS := -fPIC -O3 -g
    3539CXXFLAGS += -ansi -Wno-long-long -Wall
    36 CXXOPTS := -DAIPS_64B
     40#CXXOPTS := -DAIPS_64B
    3741
    3842# darwin specific flags
    3943ifeq "$(CASAARCH)" "darwin"
     44   #CXXFLAGS +=-DAIPS_DARWIN -arch i386 #For 10.6
    4045   CXXFLAGS +=-DAIPS_DARWIN
    41    CXXFLAGS += -Wno-long-double
     46   #CXXFLAGS += -Wno-long-double
    4247endif
    4348
     
    5863CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
    5964             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
    60              $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
     65             -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
    6166
    6267# darwin specific CASA flags
     
    7277
    7378# use python universal build
    74 ifeq "$(CASAARCH)" "darwin"
    75    PYVERSION := 2.5
    76    PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
    77    PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
    78    PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
    79 endif
     79#ifeq "$(CASAARCH)" "darwin"
     80#   PYVERSION := 2.5
     81#   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
     82#   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
     83#   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
     84#endif
    8085
    8186# the linker
Note: See TracChangeset for help on using the changeset viewer.