linux/extconf.rb in gosu-0.7.50 vs linux/extconf.rb in gosu-0.8.0.pre1

@@ -27,37 +27,34 @@
   Graphics/LargeImageData.cpp
   Graphics/TexChunk.cpp
   Graphics/Text.cpp
   Graphics/Texture.cpp
   Graphics/Transform.cpp
+  Input.cpp
   Inspection.cpp
   IO.cpp
   Math.cpp
   RubyGosu_wrap.cxx
   Utility.cpp
+  TextInput.cpp
+  Window.cpp
 )
 
 MAC_FILES = %w(
   Audio/AudioOpenAL.mm
   Graphics/BitmapApple.mm
   Graphics/TextMac.cpp
   Graphics/TextTouch.mm
-  InputMac.mm
-  TextInputMac.mm
   TimingApple.cpp
   UtilityApple.mm
-  WindowMac.mm
 )
 
 LINUX_FILES = %w(
   Audio/AudioOpenAL.cpp
   Graphics/BitmapFreeImage.cpp
   Graphics/TextUnix.cpp
-  InputX.cpp
-  TextInputX.cpp
   TimingUnix.cpp
-  WindowX.cpp
 )
 
 OGG_VORBIS_FILES = Dir['../dependencies/libogg/src/*.c'] +
                    Dir['../dependencies/libvorbis/lib/vorbisfile.c'] +
                    %w(analysis bitrate block codebook envelope floor0 floor1
@@ -73,42 +70,39 @@
 $CFLAGS << " -DGOSU_DEPRECATED="
 
 $INCFLAGS << " -I../ -I../GosuImpl"
 
 if `uname`.chomp == 'Darwin' then
-  SOURCE_FILES = BASE_FILES + MAC_FILES + OGG_VORBIS_FILES
+  SOURCE_FILES = BASE_FILES + MAC_FILES# + OGG_VORBIS_FILES
   
   # Apple curiously distributes libpng only inside X11
   $INCFLAGS  << " -I/usr/X11/include"
   # Use included libogg, libvorbis to make Gosu easier to install on OS X
-  $INCFLAGS  << " -I../dependencies/libogg/include"
-  $INCFLAGS  << " -I../dependencies/libvorbis/include"
-  $INCFLAGS  << " -I../dependencies/libvorbis/lib"
+  #$INCFLAGS  << " -I../dependencies/libogg/include"
+  #$INCFLAGS  << " -I../dependencies/libvorbis/include"
+  #$INCFLAGS  << " -I../dependencies/libvorbis/lib"
   # To make everything work with the Objective C runtime
   $CFLAGS    << " -x objective-c -DNDEBUG"
   # Compile all C++ files as Objective C++ on OS X since mkmf does not support .mm
   # files.
-  # Also undefine two debug flags that cause exceptions to randomly crash
-  # otherwise; see:
+  # Also undefine two debug flags that cause exceptions to randomly crash, see:
   # https://trac.macports.org/ticket/27237#comment:21
   # http://newartisans.com/2009/10/a-c-gotcha-on-snow-leopard/#comment-893
   CONFIG['CXXFLAGS'] = "#{CONFIG['CXXFLAGS']} -x objective-c++ -U_GLIBCXX_DEBUG -U_GLIBCXX_DEBUG_PEDANTIC"
   if `uname -r`.to_i >= 13 then
     # Use C++11 on Mavericks and above
     # TODO: This can probably be enabled starting from 10.6?
     CONFIG['CXXFLAGS'] << " -std=gnu++11"
   end
-  $LDFLAGS   << " -L/usr/X11/lib -liconv"
+  $LDFLAGS   << " -L/usr/X11/lib -liconv -lSDL2 -logg -lvorbis -lvorbisfile"
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
     $LDFLAGS << " -framework #{f}"
   end
 else
   SOURCE_FILES = BASE_FILES + LINUX_FILES
 
-  pkg_config 'sdl'
+  pkg_config 'sdl2'
   pkg_config 'pangoft2'
-  pkg_config 'x11'
-  pkg_config 'xinerama'
   
   pkg_config 'gl'
   pkg_config 'vorbisfile'
   pkg_config 'openal'
   pkg_config 'sndfile'