Ticket #34408: molmol-build.diff

File molmol-build.diff, 5.4 KB (added by howarth@…, 13 years ago)

revised molmol-build.diff to solve Lion breakage and reduce clang warnings

  • makedef

    old new  
     1 TIFFDIR = @PREFIX@/lib
     2 MESADIR =
     3 JPEGDIR = @PREFIX@/lib
     4
     5 PNGDIR = @PREFIX@/lib
     6 ZLIBDIR = /usr/lib
     7
     8# If you configured any of the above three image formats, uncomment
     9# the following four lines, and delete the non-relevant parts if
     10# necessary, i. e. if you did not configure all three formats.
     11#
     12 IMGDEF  = -DTIFF_SUPPORT -DJPEG_SUPPORT -DPNG_SUPPORT
     13 IMGINCL = -I$(TIFFDIR) -I$(JPEGDIR) -I$(PNGDIR) -I$(ZLIBDIR)
     14 IMGLIB  = $(TIFFDIR)/libtiff.3.dylib $(JPEGDIR)/libjpeg.dylib \
     15           $(PNGDIR)/libpng.dylib $(ZLIBDIR)/libz.dylib
     16
     17# Some systems do not have the float versions of various math functions,
     18# uncomment the following lines if this is the case
     19
     20  MISSFUNC = -Dsqrtf=sqrt -Dexpf=exp -Dlogf=log \
     21             -Dsinf=sin -Dcosf=cos  \
     22             -Dfabsf=fabs  -DMAXINT=INT_MAX
     23             
     24             # -Dceilf=ceil
     25
     26CPP = /usr/bin/cpp
     27
     28MCPPFLAGS =  -DMAXINT=INT_MAX -I@PREFIX@/include -I$(TOP)
     29
     30CC = gcc
     31
     32MCFLAGS = -O -Wall
     33
     34RANLIB = /usr/bin/ranlib
     35
     36WAIT = /bin/sleep 2
     37
     38SHELL = /bin/sh
     39
     40SGDEVDIR = ogl x11 no pov rib vrml1 vrml2 ps fm
     41
     42SGDEVDEF = -DSG_DEV_OGL -DSG_DEV_X11 -DSG_DEV_NO -DSG_DEV_POV -DSG_DEV_RIB -DSG_DEV_VRML1 -DSG_DEV_VRML2 -DSG_DEV_PS -DSG_DEV_CPS -DSG_DEV_FM3 -DSG_DEV_FM4
     43
     44PUDEVDIR = motif tty
     45
     46PUDEVDEF = -DPU_DEV_MOTIF -DPU_DEV_TTY
     47
     48IODEVDIR = motx11 motogl ttyno
     49
     50IODEVDEF = -DIO_DEV_MOTIF_X11 -DIO_DEV_MOTIF_OGL -DIO_DEV_TTY_NO
     51
     52
     53MOTIFDEF = -DFUNCPROTO
     54
     55SYSLIB = -L/usr/lib -L@PREFIX@/lib \
     56         -lX11 -lXm -lGLU -lGL /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib @PREFIX@/lib/libGLw.dylib \
     57         -lXmu -lXt -lXp -lXpm -lX11 -lXext -lSM -lICE -lm -lc -lmx
     58
     59TOOLSDIR = $(TOP)/tools
     60SGDIR    = $(TOP)/sg

  • molmol

    old new  
    1 #!/bin/ksh
     1#!/bin/zsh -f
    22#
    33# startup script for MOLMOL
    44#
    55
    6 MOLMOLHOME=/opt/group/MOLMOL
     6MOLMOLHOME=@PREFIX@/share/molmol;MOLMOLDEV="Motif/OpenGL"
    77export MOLMOLHOME
    88export MOLMOLDEV
    99
    … …  
    1111osrel=`uname -r`
    1212osmaj=`echo $osrel | awk -F. '{print $1}'`
    1313osmin=`echo $osrel | awk -F. '{print $2}'`
    14 localdev=
    15 glxdev=
    16 
    17 if [ $ostype = "IRIX" -o $ostype = "IRIX64" ]; then
    18   if [ $osmaj -eq 6 -a $osmin -ge 2 -o $osmaj -gt 6 ]; then
    19     arch=sgi6
    20     localdev=Motif/OpenGL
    21     glxdev=Motif/OpenGL
    22   elif [ $osmaj -eq 5 -a $osmin -ge 3 -o $osmaj -gt 5 ]; then
    23     arch=sgi5
    24     localdev=Motif/OpenGL
    25     glxdev=Motif/OpenGL
    26   else
    27     arch=sgi4
    28     localdev=Motif/GL
    29   fi
    30   MONITOR=72HZ; export MONITOR
    31 elif [ $ostype = "AIX" ]; then
    32   arch=aix
    33   localdev=Motif/OpenGL
    34 elif [ $ostype = "HP-UX" ]; then
    35   arch=hp
    36   localdev=Motif/OpenGL
    37   glxdev=Motif/OpenGL
    38 elif [ $ostype = "OSF1" ]; then
    39   arch=dec
    40   localdev=Motif/OpenGL
    41 elif [ $ostype = "Linux" ]; then
    42   arch=lnx
    43   localdev=Motif/OpenGL
    44 elif [ $ostype = "SunOS" ]; then
    45   if [ $osmaj -eq 5 -a $osmin -ge 4 -o $osmaj -gt 5 ]; then
    46     arch=sol
    47     localdev=Motif/OpenGL
    48   else
    49     arch=sun
    50   fi
    51 else
    52   arch=unknown
    53 fi
    54 
    55 if [ $ostype = "SunOS" ]; then
    56   xdpy=/usr/openwin/bin/xdpyinfo
    57 elif [ $ostype = "HP-UX" ]; then
    58   xdpy=/usr/contrib/bin/X11/xdpyinfo
    59 else
    60   xdpy=/usr/bin/X11/xdpyinfo
    61 fi
    62 
     14localdev=Motif/OpenGL
     15glxdev=Motif/OpenGL
    6316printUsage () {
    6417  echo "Usage: molmol -ht2as [-o dev] [-r range] [-f macro] files"
    6518  echo ""
    … …  
    209162fi
    210163
    211164if [ "$input" = "-" -o -n "$nograph" ]; then
    212   $MOLMOLHOME/molmol.$arch $xopt
     165    echo "LineBond solid 1  "  >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt
    213166else
    214   $MOLMOLHOME/molmol.$arch $xopt < /dev/null
     167    echo "LineBond solid 1  "  >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt
    215168fi

  • src/iodev/IODev.c

    old new  
    4444#endif
    4545#ifdef IO_DEV_MOTIF_OGL
    4646extern void IOMotifOGLSetDev(void);
    47 extern void IOMotifOGLDSetDev(void);
    4847#endif
    4948#ifdef IO_DEV_MOTIF_XGL
    5049extern void IOMotifXGLSetDev(void);
    … …  
    7675#endif
    7776#ifdef IO_DEV_MOTIF_OGL
    7877  {"Motif/OpenGL", IOMotifOGLSetDev},
    79   {"Motif/OpenGLD", IOMotifOGLDSetDev},
    8078#endif
    8179#ifdef IO_DEV_MOTIF_XGL
    8280  {"Motif/XGL", IOMotifXGLSetDev},

  • src/motogl/MotOGL.c

    old new  
    3131#include <Xm/XmStrDefs.h>
    3232
    3333#define BOOL MOTIF_BOOL  /* hack to avoid naming conflict */
    34 #include <X11/GLw/GLwMDrawA.h>
     34#include <GL/GLwMDrawA.h>
    3535#undef BOOL
    3636
    3737#include <sg.h>

  • src/os/GFile.c

    old new  
    3838const INT32 GFMagic = 0x3b7a12f9;
    3939
    4040#ifndef __linux__
    41 extern char *sys_errlist[];
    4241#endif
    4342extern int errno;
    4443

  • tools/include/values.h

    old new  
     1#include <math.h>
     2#include <limits.h>

  • src/data/DataDist.c

    old new  
    8989{
    9090  TabEntryInter *entryP = p;
    9191
    92   return ((unsigned) entryP->atom1P + (unsigned) entryP->atom2P) % size;
     92  return ((unsigned)(uintptr_t) entryP->atom1P + (unsigned)(uintptr_t) entryP->atom2P) % size;
    9393}
    9494
    9595static int