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.7 KiB

  1. --- ./makefile.unix.orig 2006-07-19 22:33:21.000000000 +0200
  2. +++ ./makefile.unix 2006-07-19 22:36:27.000000000 +0200
  3. @@ -97,7 +97,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. @@ -108,7 +108,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 = $(CC)
  16. # HOST_CC = @gcc
  17. @@ -118,7 +118,7 @@
  18. # If you want to use whatever CFLAGS are currently set in your
  19. # environment, then comment this out.
  20. -CFLAGS =
  21. +# CFLAGS =
  22. ###########################################################################
  23. @@ -127,7 +127,7 @@
  24. ###########################################################################
  25. # GCC on x86
  26. -CFLAGS = -O2
  27. +# CFLAGS = -O2
  28. # GCC on x86 with some optimizations
  29. # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
  30. @@ -483,7 +483,7 @@
  31. # Does your platform have ranlib? Leave this untouched unless you are
  32. # using IRIX, Unixware 7, or the Intel C++ Compiler.
  33. -RANLIB = @ranlib
  34. +# RANLIB = @ranlib
  35. # RANLIB = @true
  36. @@ -560,7 +560,7 @@
  37. # Select destination directory for your compiled program, manual page,
  38. # and binary distribution.
  39. ifndef PREFIX
  40. -PREFIX = /usr/local
  41. +PREFIX = /usr
  42. endif
  43. BINDIR = $(PREFIX)/bin
  44. MANDIR = $(PREFIX)/man/man6
  45. @@ -576,7 +576,9 @@
  46. ###########################################################################
  47. # i386, GNU asm
  48. +ifndef MY_CPU
  49. MY_CPU = i386
  50. +endif
  51. # i386, no asm -- needed for the Intel C++ compiler, which does not fully
  52. # understand GCC's inline assembly syntax, though you may still enable
  53. @@ -670,7 +672,7 @@
  54. # Enable the standard joystick driver, which should work in Linux, OpenBSD,
  55. # NetBSD, and FreeBSD.
  56. -# JOY_STANDARD = 1
  57. +JOY_STANDARD = 1
  58. # Linux FM-TOWNS game pad joystick emulation support. Thanks to Osamu
  59. # Kurati.
  60. @@ -683,7 +685,7 @@
  61. # JOY_PS2 = 1
  62. # SDL joystick support.
  63. -# JOY_SDL = 1
  64. +JOY_SDL = 1
  65. # This will enable the use of the Happ Controls UGCI(tm) USB devices'
  66. # Coin/Start inputs using the libugci library available from
  67. @@ -712,10 +714,10 @@
  68. # Choose any additonal sound drivers you want to include, besides the
  69. # native sound driver for your system.
  70. # SOUND_ESOUND = 1
  71. -# SOUND_ALSA = 1
  72. +SOUND_ALSA = 1
  73. # SOUND_ARTS_TEIRA = 1
  74. # SOUND_ARTS_SMOTEK = 1
  75. -# SOUND_SDL = 1
  76. +SOUND_SDL = 1
  77. # SOUND_WAVEOUT = 1
  78. @@ -727,10 +729,10 @@
  79. # use SDL.
  80. # X11 (including Glide & OpenGL if enabled below)
  81. -DISPLAY_METHOD = x11
  82. +# DISPLAY_METHOD = x11
  83. # SDL library
  84. -# DISPLAY_METHOD = SDL
  85. +DISPLAY_METHOD = SDL
  86. # SVGALib, only supported under Linux
  87. # DISPLAY_METHOD = svgalib