Ticket #50810: patch-cgx-build.diff

File patch-cgx-build.diff, 2.3 KB (added by mbrethen, 9 years ago)
  • CalculiX/cgx_2.10/src

    diff -u CalculiX/cgx_2.10/src.orig/Makefile CalculiX/cgx_2.10/src/Makefile
    old new  
    1 CFLAGS = -O3 -Wall \
     1CFLAGS = \
    22  -I./ \
    33  -I/usr/include \
    44  -I/usr/include/GL \
     
    77  -I/usr/X11/include
    88
    99LFLAGS = \
    10   -L/usr/lib64 -lGL -lGLU \
    11   -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
    12   -lm -lpthread -lrt
     10  -L/usr/lib -lGL -lGLU \
     11  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE
    1312
    1413
    1514# on 32bit systems change lib64 to lib
     
    6665OUTIL = $(SUTIL:.c=.o)
    6766
    6867cgx: $(OLIB) $(OUTIL) $(OULIB)
    69         g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
     68        $(CXX)  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
    7069
    7170
    7271
  • CalculiX/cgx_2.10/src

    diff -u CalculiX/cgx_2.10/src.orig/cgx.h CalculiX/cgx_2.10/src/cgx.h
    old new  
    7979                             "/yaprod/cae/application/CalculiX/doc/ccx_2.10/ccx.html"}
    8080  #endif
    8181#elif defined AFLIB
    82   #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
    83     "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
    84     "/usr/local/CalculiX/cgx_2.10/doc/aflib/aflib.pdf"}
     82  #define     HELPFILE        {"@@PREFIX@@/share/doc/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
     83    "@@PREFIX@@/share/doc/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
     84    "@@PREFIX@@/share/doc/CalculiX/cgx_2.10/doc/aflib/aflib.pdf"}
    8585#else
    86   #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
    87     "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
     86  #define     HELPFILE        {"@@PREFIX@@/share/doc/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
     87    "@@PREFIX@@/share/doc/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
    8888#endif
    8989
    9090/* html browser, change if necessary */
     
    9595#else
    9696/* #define     BROWSER         {"netscape"} */
    9797/*   #define     BROWSER         {"mozilla"} */
    98   #define     BROWSER         {"firefox"}
     98  #define     BROWSER         {"openbrowser"}
    9999/* #define     PSVIEWER         {"ghostview"} */
    100   #define     PSVIEWER         {"gv"}
     100  #define     PSVIEWER         {"open"}
    101101#endif
    102102
    103103/* more parameters, better do not change them! */