Ticket #22151: ccpnmr.patch

File ccpnmr.patch, 5.8 KB (added by howarth@…, 14 years ago)

fix patch to link -lglut rather than -lfreeglut

  • bin/analysis

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5

  • bin/formatConverter

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/format/gui/FormatConverter.py $1 $2

  • bin/pipe2azara

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3

  • ccpnmr2.1/c/environment-opengl.txt

    old new  
     1#Environment file for use with fink to build ccpnmr suite - environment.txt
     2
     3CC = gcc
     4LINK = $(CC)
     5MAKE = make
     6CO_NAME = -c $<
     7OUT_NAME = -o $@
     8OBJ_SUFFIX = o
     9DYLIB_SUFFIX = so
     10RM = rm -f
     11WIN_FLAG =
     12
     13MALLOC_FLAG =
     14FPIC_FLAG = -fPIC
     15CFLAGS = -O3 $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -ffast-math
     16
     17LINK_LIBRARIES = sh linkSharedObjs
     18COPY_LIBRARIES = sh copySharedObjs
     19
     20GL_FLAG = -DUSE_GL_TRUE
     21#GL_FLAG = -DUSE_GL_FALSE
     22
     23#GLUT_NEED_INIT =
     24GLUT_NEED_INIT = -DNEED_GLUT_INIT
     25#GLUT_NOT_IN_GL = -DGLUT_IN_OWN_DIR
     26GLUT_FLAG = $(GLUT_NEED_INIT) $(GLUT_NOT_IN_GL)
     27
     28SHARED_FLAGS = -L@PREFIX@/lib -bundle -bundle_loader @PYTHON_BIN@ "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
     29
     30MATH_LIB = -lm
     31
     32X11_DIR = /usr/X11R6
     33X11_LIB = -lX11 -lXext
     34X11_INCLUDE_FLAGS = -I$(X11_DIR)/include
     35X11_LIB_FLAGS = -L$(X11_DIR)/lib
     36
     37TCL_DIR = @PREFIX@
     38TCL_LIB = -ltcl
     39TCL_INCLUDE_FLAGS = -I$(TCL_DIR)/include
     40TCL_LIB_FLAGS = -L$(TCL_DIR)/lib
     41
     42TK_DIR = @PREFIX@
     43TK_LIB = -ltk
     44TK_INCLUDE_FLAGS = -I$(TK_DIR)/include
     45TK_LIB_FLAGS = -L$(TK_DIR)/lib
     46
     47PYTHON_DIR = @PREFIX@
     48PYTHON_LIB =
     49PYTHON_INCLUDE_FLAGS = -I@PYTHON_INCL@
     50PYTHON_LIB_FLAGS = -L@PREFIX@ -lpython2.6
     51
     52GL_DIR = /usr/X11R6
     53GL_LIB = -lglut -lGLU -lGL
     54GL_INCLUDE_FLAGS = -I$(GL_DIR)/include -I@PREFIX@/include
     55GL_LIB_FLAGS = -L$(GL_DIR)/lib -L@PREFIX@/lib

  • ccpnmr2.1/c/ccp/structure/Makefile

    old new  
    3535        $(GLOBAL_DIR)/py_ps_handler.o \
    3636        $(GLOBAL_DIR)/py_tk_handler.o
    3737
    38 ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
     38ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
    3939        $(X11_INCLUDE_FLAGS) \
    40         $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
     40        $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
    4141
    42 ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
     42ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
    4343
    4444ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
    4545

  • ccpnmr2.1/c/ccpnmr/analysis/Makefile

    old new  
    4040        $(GLOBAL_DIR)/py_ps_handler.o \
    4141        $(GLOBAL_DIR)/py_tk_handler.o
    4242
    43 ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
     43ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
    4444        $(X11_INCLUDE_FLAGS) \
    45         $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
     45        $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
    4646
    47 ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
     47ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
    4848
    4949ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
    5050

  • ccpnmr2.1/c/memops/global/Makefile

    old new  
    9999
    100100TCLTK_LIB = $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
    101101
    102 ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
    103         $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
     102ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
     103        $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
    104104
    105 ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
     105ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
    106106
    107107ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
    108108

  • bin/dataShifter

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/format/gui/DataShifter.py

  • bin/updateAll

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdateAuto.py

  • bin/updateCheck

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdatePopup.py