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.

110 lines
2.8 KiB

  1. --- ./makefile.unix.orig 2004-11-24 20:47:30.000000000 +0100
  2. +++ ./makefile.unix 2004-11-24 22:11:19.031067264 +0100
  3. @@ -89,7 +89,7 @@
  4. # just as well. However, stay away from the `cc' Ultrix compiler if
  5. # possible.
  6. -CC = gcc
  7. +# CC = gcc
  8. # CC = cc
  9. # CC = icc
  10. # CC = c89
  11. @@ -101,7 +101,7 @@
  12. # Compiler for host compilations in cross-compiling environments (used
  13. # in src/unix/unix.mak for m68k).
  14. # HOST_CC=$(CC)
  15. -HOST_CC = gcc
  16. +# HOST_CC = gcc
  17. ###########################################################################
  18. @@ -110,7 +110,7 @@
  19. # If you want to use whatever CFLAGS are currently set in your
  20. # environment, then comment this out.
  21. -CFLAGS =
  22. +# CFLAGS =
  23. ###########################################################################
  24. @@ -119,7 +119,7 @@
  25. ###########################################################################
  26. # GCC on x86
  27. -CFLAGS = -O -Wall -Wno-unused
  28. +# CFLAGS = -O -Wall -Wno-unused
  29. # GCC on x86 with some optimizations
  30. # CFLAGS = -O2 -Wall -Wno-unused -mcpu=i686 -fomit-frame-pointer \
  31. @@ -429,7 +429,7 @@
  32. # Does your platform have ranlib? Leave this untouched unless you are
  33. # using IRIX, Unixware 7, or the Intel C++ Compiler.
  34. -RANLIB = ranlib
  35. +# RANLIB = ranlib
  36. # RANLIB = true
  37. @@ -504,7 +504,7 @@
  38. # Select destination directory for your compiled program, manual page,
  39. # and binary distribution.
  40. ifndef PREFIX
  41. -PREFIX = /usr/local
  42. +PREFIX = /usr
  43. endif
  44. BINDIR = $(PREFIX)/bin
  45. MANDIR = $(PREFIX)/man/man6
  46. @@ -520,7 +520,9 @@
  47. ###########################################################################
  48. # i386, GNU asm
  49. +ifndef MY_CPU
  50. MY_CPU = i386
  51. +endif
  52. # i386, no asm -- needed for the Intel C++ compiler, which does not fully
  53. # understand GCC's inline assembly syntax, though you may still enable
  54. @@ -611,7 +613,7 @@
  55. # Enable the standard joystick driver, which should work in Linux, OpenBSD,
  56. # NetBSD, and FreeBSD.
  57. -# JOY_STANDARD = 1
  58. +JOY_STANDARD = 1
  59. # Linux FM-TOWNS game pad joystick emulation support. Thanks to Osamu
  60. # Kurati.
  61. @@ -624,7 +626,7 @@
  62. # JOY_PS2 = 1
  63. # SDL joystick support.
  64. -# JOY_SDL = 1
  65. +JOY_SDL = 1
  66. # This will enable the use of the Happ Controls UGCI(tm) USB devices'
  67. # Coin/Start inputs using the libugci library available from
  68. @@ -650,10 +652,10 @@
  69. # Choose any additonal sound drivers you want to include, besides the
  70. # native sound driver for your system.
  71. # SOUND_ESOUND = 1
  72. -# SOUND_ALSA = 1
  73. +SOUND_ALSA = 1
  74. # SOUND_ARTS_TEIRA = 1
  75. # SOUND_ARTS_SMOTEK = 1
  76. -# SOUND_SDL = 1
  77. +SOUND_SDL = 1
  78. # SOUND_WAVEOUT = 1
  79. @@ -665,10 +667,10 @@
  80. # use SDL.
  81. # X11 (including Glide & OpenGL if enabled below)
  82. -DISPLAY_METHOD = x11
  83. +# DISPLAY_METHOD = x11
  84. # SDL library
  85. -# DISPLAY_METHOD = SDL
  86. +DISPLAY_METHOD = SDL
  87. # SVGALib, only supported under Linux
  88. # DISPLAY_METHOD = svgalib