summarylogtreecommitdiffstats
path: root/makefile.patch
blob: 38f7787a2fea2b22aee708f96fbe34ff99379662 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
*** origMakefile	2011-03-08 19:55:26.000000000 +0100
--- Makefile	2012-05-18 19:04:04.412722880 +0200
***************
*** 32,44 ****
  
  # section to define the various symbols needed to build DRAWxtl for Linux systems
  
!   prefix          = /usr/local
    includedir      = ${prefix}/include
    libdir          = /usr/lib/
  
    BUILD_CPU=$(shell uname -m)
    ifneq (,$(findstring 64,$(BUILD_CPU)))
!       libdir	  = /usr/lib64/
    endif
  
  # compiler name:
--- 32,44 ----
  
  # section to define the various symbols needed to build DRAWxtl for Linux systems
  
!   prefix          = /usr/
    includedir      = ${prefix}/include
    libdir          = /usr/lib/
  
    BUILD_CPU=$(shell uname -m)
    ifneq (,$(findstring 64,$(BUILD_CPU)))
!       libdir	  = /usr/lib/
    endif
  
  # compiler name:
***************
*** 49,59 ****
  # work around a bug in freeglut 2.4 - only enable this if you have to use a version 
  # of fltk before 1.1.8 AND exactly version 2.4 of freeglut
  #  GLUT		  = -DFREEGLUT24
!   CXXFLAGS        = $(OPTIM)  -I/usr/X11R6/include $(GLUT)
  
  # libraries to link with:
!   GLDLIBS  =  -L/usr/X11R6/lib  -lGLU -lGL -lXinerama -lXft -lpthread -lm  -lXext -lX11  -lXpm \
! 		-lfltk \
  # -lglut # only needed with old versions of fltk before 1.1.8
  #       -lXi -lgdkglext-x11-1.0a  # Fedora Core 2 needs these libraries
    LINKFLTKGL  = $(libdir)libfltk.a $(libdir)libfltk_gl.a
--- 49,59 ----
  # work around a bug in freeglut 2.4 - only enable this if you have to use a version 
  # of fltk before 1.1.8 AND exactly version 2.4 of freeglut
  #  GLUT		  = -DFREEGLUT24
!   CXXFLAGS        = $(OPTIM)  $(GLUT)
  
  # libraries to link with:
!   GLDLIBS  =  -lGLU -lGL -lXinerama -lXft -lpthread -lm  -lXext -lX11  -lXpm \
! 		-lfltk -ldl -lfontconfig\
  # -lglut # only needed with old versions of fltk before 1.1.8
  #       -lXi -lgdkglext-x11-1.0a  # Fedora Core 2 needs these libraries
    LINKFLTKGL  = $(libdir)libfltk.a $(libdir)libfltk_gl.a