Ruby-2.0.0-p247 does no longer mix CFLAGS and CXXFLAGS.

So we need to use it properly too. See bug https://bugs.ruby-lang.org/issues/6504#change-38019
larskanis · Jun 28, 2013 · fed79ff · fed79ff
1 parent 82974d4
commit fed79ff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ext/fox16_c/extconf.rb b/ext/fox16_c/extconf.rb
@@ -110,10 +110,10 @@ def do_rake_compiler_setup
   $libs = append_library($libs, "Xrandr") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   $libs = append_library($libs, "Xcursor") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   $libs = append_library($libs, "png")
-  $CFLAGS = $CFLAGS + " -O0 -I#{File.join(File.dirname(__FILE__), 'include')}"
+  find_header('FXRbCommon.h', File.join(File.dirname(__FILE__), 'include'))
   if is_fxscintilla_build?
     FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
-    $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
+    $CPPFLAGS = $CPPFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
     $libs = append_library($libs, "fxscintilla")
   else
     FileUtils.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exist?('scintilla_wrap.cpp')