mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

47 lines
1.8 KiB

  1. --- ./linux/Makefile.orig 2004-10-04 00:13:52.812539096 +0000
  2. +++ ./linux/Makefile 2004-10-04 00:15:42.650841136 +0000
  3. @@ -104,11 +104,11 @@
  4. .SUFFIXES: .cxx
  5. CXX = g++
  6. - CXXDEBUGFLAGS = -O2 -m486
  7. + CXXDEBUGFLAGS = -O2
  8. CXXEXTRA_DEFINES =
  9. CXXEXTRA_INCLUDES =
  10. CXXIDL_INCLUDES = -I$(TOP)/include
  11. - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  12. + CXXSTD_DEFINES = -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  13. CXXOPTIONS =
  14. CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) $(CXXIDL_INCLUDES)
  15. CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES)
  16. @@ -148,8 +148,8 @@
  17. LATEX = latex
  18. STD_INCLUDES =
  19. - STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  20. - STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  21. + STD_CPP_DEFINES = -traditional -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  22. + STD_DEFINES = -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  23. EXTRA_LOAD_FLAGS = -Wl,-rpath,/usr/X11R6/lib
  24. EXTRA_LDOPTIONS =
  25. EXTRA_LIBRARIES =
  26. @@ -180,7 +180,7 @@
  27. TOP_INCLUDES = -I$(INCROOT)
  28. - CDEBUGFLAGS = -O2 -m486
  29. + CDEBUGFLAGS = -O2
  30. CCOPTIONS = -ansi
  31. ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
  32. @@ -473,8 +473,8 @@
  33. CCOPTIONS = -ansi -fPIC
  34. -STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  35. -CDEBUGFLAGS = -O2 -m486
  36. +STD_DEFINES = -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
  37. +CDEBUGFLAGS = -O2
  38. # Copyright (c) Mark J. Kilgard, 1994.
  39. # Glut.cf - GLUT distribution Imakefile configuration info