API tools faq
paste
Advertisement
uaa

emulators/openmsx/patch/patch-build_main_mk candidate

uaa
Jan 2nd, 2017
166
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.67 KB | None | 0 0
raw download clone embed print report
  1. --- build/main.mk.orig Mon Aug 1 04:02:11 2016
  2. +++ build/main.mk Tue Jan 3 08:13:04 2017
  3. @@ -325,24 +325,24 @@ COMPILE_FLAGS+=$(TARGET_FLAGS)
  4. LINK_FLAGS+=$(TARGET_FLAGS)
  5.  
  6. # Determine compiler.
  7. -CXX?=g++
  8. -WINDRES?=windres
  9. +#CXX?=g++
  10. +#WINDRES?=windres
  11. DEPEND_FLAGS:=
  12. -ifneq ($(filter %clang++,$(CXX))$(filter clang++%,$(CXX)),)
  13. - # Enable C++11
  14. - COMPILE_FLAGS+=-std=c++11
  15. - # Clang does support -Wunused-macros, but it triggers on SDL's headers,
  16. - # causing way too many false positives that we cannot fix.
  17. - COMPILE_FLAGS+=-Wall -Wextra -Wundef -Wno-invalid-offsetof -Wshadow
  18. - # TODO: Remove the overloading from the code instead.
  19. - COMPILE_FLAGS+=-Wno-overloaded-virtual
  20. - # Hardware descriptions can contain constants that are not used in the code
  21. - # but still useful as documentation.
  22. - COMPILE_FLAGS+=-Wno-unused-const-variable
  23. - CC:=$(shell clang++ -print-prog-name=clang)
  24. - DEPEND_FLAGS+=-MP
  25. -else
  26. -ifneq ($(filter %g++,$(CXX))$(filter g++%,$(CXX))$(findstring /g++-,$(CXX)),)
  27. +#ifneq ($(filter %clang++,$(CXX))$(filter clang++%,$(CXX)),)
  28. +# # Enable C++11
  29. +# COMPILE_FLAGS+=-std=c++11
  30. +# # Clang does support -Wunused-macros, but it triggers on SDL's headers,
  31. +# # causing way too many false positives that we cannot fix.
  32. +# COMPILE_FLAGS+=-Wall -Wextra -Wundef -Wno-invalid-offsetof -Wshadow
  33. +# # TODO: Remove the overloading from the code instead.
  34. +# COMPILE_FLAGS+=-Wno-overloaded-virtual
  35. +# # Hardware descriptions can contain constants that are not used in the code
  36. +# # but still useful as documentation.
  37. +# COMPILE_FLAGS+=-Wno-unused-const-variable
  38. +# CC:=$(shell clang++ -print-prog-name=clang)
  39. +# DEPEND_FLAGS+=-MP
  40. +#else
  41. +#ifneq ($(filter %g++,$(CXX))$(filter g++%,$(CXX))$(findstring /g++-,$(CXX)),)
  42. # Generic compilation flags.
  43. COMPILE_FLAGS+=-pipe
  44. # Enable C++11
  45. @@ -366,16 +366,16 @@ ifneq ($(filter %g++,$(CXX))$(filter g++%,$(CXX))$(fin
  46.  
  47. # Empty definition of used headers, so header removal doesn't break things.
  48. DEPEND_FLAGS+=-MP
  49. - # Plain C compiler, for the 3rd party libs.
  50. - CC:=$(subst g++,gcc,$(CXX))
  51. -else
  52. - ifneq ($(filter %gcc,$(CXX))$(filter gcc%,$(CXX)),)
  53. - $(error Set CXX to your "g++" executable instead of "gcc")
  54. - else
  55. - $(warning Unsupported compiler: $(CXX), please update Makefile)
  56. - endif
  57. -endif
  58. -endif
  59. +# # Plain C compiler, for the 3rd party libs.
  60. +# CC:=$(subst g++,gcc,$(CXX))
  61. +#else
  62. +# ifneq ($(filter %gcc,$(CXX))$(filter gcc%,$(CXX)),)
  63. +# $(error Set CXX to your "g++" executable instead of "gcc")
  64. +# else
  65. +# $(warning Unsupported compiler: $(CXX), please update Makefile)
  66. +# endif
  67. +#endif
  68. +#endif
  69.  
  70. # Strip binary?
  71. OPENMSX_STRIP?=false
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!