eglaysher · a1batross · May 4, 2015 · May 5, 2015 · May 2, 2015 · May 5, 2015
diff --git a/.dir-locals.el b/.dir-locals.el
@@ -1,5 +1,9 @@
-;; Project specific local variables for emacs23. `compile-command' is the only
-;; one not set by the individual files. Hopefully this list will grow.
-((nil . ((compile-command . "scons")
-         (tab-width . 2)
-         (indent-tabs-mode . nil))))
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((nil
+  (my-org-project-name . "rlvm")
+  (compile-command . "scons")
+  (tab-width . 2)
+  (indent-tabs-mode)))
+
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ rlvm.suo
 /build
 /.sconf_temp
 /.sconsign.dblite
+_site
diff --git a/AUTHORS.TXT b/AUTHORS.TXT
@@ -32,6 +32,7 @@ luabind - http://www.rasterbar.com/products/luabind.html
 guichan - http://guichan.sourceforge.net/
 googletest - http://code.google.com/p/googletest/
 googlemock - http://code.google.com/p/googlemock/
+zita-resampler - http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.
 
 Libraries depended on (and are not included)
 -------------------------------------------------------------------------

diff --git a/COPYING.TXT b/COPYING.TXT
@@ -33,6 +33,7 @@ III) Libraries included unmodified in the rlvm distribution:
  g) Guichan
  h) SDL_image
  i) SDL_mixer
+ j) zita-resampler
 
 IV) Libraries linked against by rlvm (but not included in the distribution)
  a) boost.org license
@@ -450,6 +451,23 @@ You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+------------------------------------------------------- [ zita-resampler ]
+
+Copyright (C) 2006-2011 Fons Adriaensen <[email protected]>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 -------------------------------------------------------------------------
 Part IV: Libraries linked against by rlvm
 -------------------------------------------------------------------------

diff --git a/GPL.TXT → LICENSE.txt b/GPL.TXT → LICENSE.txt
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    {project}  Copyright (C) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ rlvm currently plays the following games to their completion:
 | Planetarian            | Works; [buy here][planetarian] |
 
 [kanon]: http://radicalr.pestermom.com/vn.html
-[clannad]: https://sekaiproject.com/blog-en/sekai-project-and-visualarts-announce-the-licensing-of-clannad-full-voice-edition/
+[clannad]: http://store.steampowered.com/app/324160/
 [planetarian]: http://store.steampowered.com/app/316720/
 
 For more details, please read STATUS.TXT.
@@ -50,8 +50,7 @@ first hand or what I've been told.
 
 rlvm has an implementation of rlBabel; English patches compiled with
 Haeleth's rlBabel should line break correctly. I've successfully tested
-it with the Kanon patch from NDT and the beta CLANNAD patches from
-Baka-Tsuki's Assembla page.
+it with the Kanon patch from NDT.
 
 rlvm supports KOE, NWK and OVK archives for voices, along with ogg
 vorbis voice patches which follow the convention
@@ -164,6 +163,4 @@ getting it working.
 
 ## DONATE
 
-Have you found rlvm useful? I accept donations in bitcoin at the following address: [18LntbVY1GMZeioDYnst8yFmYQP86P4iKi][bitcoin]
-
-[bitcoin]: https://blockchain.info/address/18LntbVY1GMZeioDYnst8yFmYQP86P4iKi
+Have you found rlvm useful? I accept donations in bitcoin at the following address: 3Ee9s6BzmSZQK2yf4DU3p8vk1ttrsnFoQ2
diff --git a/SConscript b/SConscript
@@ -18,6 +18,7 @@ root_env.Append(
     "-Wall",
     "-Wno-sign-compare",
     "-Wno-narrowing",
+    "-Wno-write-strings",    # For XPM support
     "-std=c++11"
   ]
 )
@@ -30,32 +31,8 @@ root_env.ParseConfig("sdl2-config --libs")
 
 #########################################################################
 
-# All the PNG files taken from The Mana World that we want to compile in
-guichan_resources = [
-  "src/platforms/gcn/button_disabled.png",
-  "src/platforms/gcn/buttonhi.png",
-  "src/platforms/gcn/button.png",
-  "src/platforms/gcn/buttonpress.png",
-  "src/platforms/gcn/deepbox.png",
-  "src/platforms/gcn/hscroll_left_default.png",
-  "src/platforms/gcn/hscroll_left_pressed.png",
-  "src/platforms/gcn/hscroll_right_default.png",
-  "src/platforms/gcn/hscroll_right_pressed.png",
-  "src/platforms/gcn/vscroll_down_default.png",
-  "src/platforms/gcn/vscroll_down_pressed.png",
-  "src/platforms/gcn/vscroll_grey.png",
-  "src/platforms/gcn/vscroll_up_default.png",
-  "src/platforms/gcn/vscroll_up_pressed.png"
-]
-
-# Build the resource compiler and then use it to make the inline header file.
-root_env.Program('wxInclude', ['vendor/wxInclude.cpp'])
-root_env.Command('$BUILD_DIR/resource_header.h',
-                 ['$BUILD_DIR/wxInclude', guichan_resources],
-                 ["$SOURCE --silent --wxnone --output-file=$TARGET " +
-                  " ".join(guichan_resources)])
-
-# We'll need to be able to see the autogenerated header:
+# We used to set this just for an autogenerated header, but now it's wrapped
+# its tentacles everywhere.
 root_env.Append(
   CPPPATH = ["$BUILD_DIR"]
 )
@@ -235,6 +212,14 @@ libsystemsdl_files = [
   "src/systems/sdl/sdl_utils.cc",
   "src/systems/sdl/shaders.cc",
   "src/systems/sdl/texture.cc",
+
+  # Parts of zresample
+  "src/systems/sdl/resample.cc",
+  "src/systems/sdl/audiofile.cc",
+  "src/systems/sdl/dither.cc",
+  "src/systems/sdl/zresample.cc",
+
+  # Parts of pygame.
   "vendor/pygame/alphablit.cc"
 ]
 

diff --git a/SConscript.gtk b/SConscript.gtk
@@ -1,9 +1,10 @@
 Import('env')
 
 root_env = env.Clone()
-root_env.Append(LIBS=["GL", "GLU"])
+root_env.Append(LIBS=["GL"])
 root_env.ParseConfig('sdl2-config --cflags --libs')
-root_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
+root_env.ParseConfig('pkg-config --cflags --libs libpng')
+# root_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
 
 root_env.Append(
   CXXFLAGS = [
@@ -16,8 +17,8 @@ gtkrlvm_files = [
   # Technically cross platform, but put here for SDL dependency.
   "src/machine/rlvm_instance.cc",
 
-  "src/platforms/gtk/rlvm.cc",
-  "src/platforms/gtk/gtk_rlvm_instance.cc",
+  "src/platforms/sdl/rlvm.cc",
+  "src/platforms/sdl/sdl_rlvm_instance.cc",
 ]
 
 root_env.RlvmProgram('rlvm', gtkrlvm_files,

diff --git a/SConscript.luarlvm b/SConscript.luarlvm
@@ -21,8 +21,9 @@ test_env.Append(
 if test_env['PLATFORM'] == 'darwin':
   test_env.Append(FRAMEWORKS=["OpenGL"])
 else:
-  test_env.Append(LIBS=["GL", "GLU"])
+  test_env.Append(LIBS=["GL"])
 test_env.ParseConfig("sdl2-config --libs")
+test_env.ParseConfig('pkg-config --cflags --libs libpng')
 
 test_env.Append(CPPPATH = ["#/test"])
 

diff --git a/SConstruct b/SConstruct
@@ -41,9 +41,8 @@ env = Environment(
     # We use gettext for translations.
     "ENABLE_NLS",
 
-    # This prevents conflicts between SDL and GLEW. I shouldn't have to do
-    # this, but the SDL_opengl.h and glew.h differ in const correctness...
-    "NO_SDL_GLEXT"
+    # Use glext.h
+    "GL_GLEXT_PROTOTYPES"
   ],
 
   # Where the final binaries should be put.
@@ -213,15 +212,14 @@ def CheckForSystemLibrary(config, library_dict, componentlist):
     lib_name = library_dict['library']
     print "(Using included version of %s)" % lib_name
     componentlist.append(lib_name)
-    config.Define("HAVE_LIB" + lib_name, 1,
+    config.Define("HAVE_LIB" + lib_name.replace("-", "_"), 1,
                   "Define to 1 if you have the `%s' library." % lib_name)
 
 
 #########################################################################
 ## Configuration
 #########################################################################
 subcomponents = [ ]
-static_sdl_libs = [ ]
 
 config = env.Configure(custom_tests = {'CheckBoost'   : CheckBoost,
 #                                       'CheckGuichan' : CheckGuichan
@@ -236,6 +234,8 @@ VerifyLibrary(config, 'ogg', 'ogg/ogg.h')
 VerifyLibrary(config, 'vorbis', 'vorbis/codec.h')
 VerifyLibrary(config, 'vorbisfile', 'vorbis/vorbisfile.h')
 
+VerifyLibrary(config, 'sndfile', 'sndfile.h')
+
 # In short, we do this because the SCons configuration system doesn't give me
 # enough control over the test program. Even if the libraries are installed,
 # they won't compile because SCons outputs "int main()" instead of "int
@@ -250,9 +250,9 @@ else:
 # Libraries we need, but will use a local copy if not installed.
 local_sdl_libraries = [
   {
-    "include"  : 'GL/glew.h',
-    "library"  : 'GLEW',
-    "function" : 'glewInit();'
+    'include'  : 'zita-resampler/resampler.h',
+    'library'  : 'zita-resampler',
+    'function' : '',
   },
   {
     'include'  : 'SDL2/SDL_ttf.h',
@@ -279,7 +279,7 @@ for library_dict in local_sdl_libraries:
 #   subcomponents.append("guichan")
 
 # Get the configuration from sdl and freetype
-env.ParseConfig("sdl-config --cflags")
+env.ParseConfig("sdl2-config --cflags")
 env.ParseConfig("freetype-config --cflags --libs")
 
 env = config.Finish()
@@ -326,7 +326,7 @@ if GetOption('release'):
         "-ffunction-sections",
         "-fdata-sections",
         ],
-
+  
       LINKFLAGS = [
         "-Wl,--gc-sections"
         ],

diff --git a/STATUS.TXT b/STATUS.TXT
@@ -20,7 +20,13 @@ CLANNAD FULL VOICE
 ------------------
 - All routes playable to the end.
 - Voices work.
-- Partially playable with the Baka-Tsuki English patch (currently beta)
+
+CLANNAD English Edition
+-----------------------
+- Currently busted.
+  - Problems while drawing the text boxes.
+  - Dangopedia is completely broken due to the database subsystem being
+    unimplemented.
 
 Tomoyo After Memorial Edition
 -----------------------------

diff --git a/debian/control b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 7.0.50~), libsdl1.2-dev, libfreetype6-dev,
                libboost-serialization-dev, libboost-date-time-dev, 
                libboost-iostreams-dev, libboost-program-options-dev,
                libboost-thread-dev, libguichan-dev,
-               zlib1g-dev, libsdl-ttf2.0-dev, libgtk2.0-dev
+               zlib1g-dev, libsdl-ttf2.0-dev, libgtk2.0-dev,
+               libzita-resampler-dev
 Homepage: http://rlvm.net
 
 Package: rlvm

diff --git a/debian/rlvm.6 b/debian/rlvm.6
@@ -41,8 +41,6 @@ AIR
 .IP \[bu]
 CLANNAD / CLANNAD Full Voice Edition
 .IP \[bu]
-CLANNAD Full Voice Edition (With Baka-Tsuki's English patch)
-.IP \[bu]
 Planetarian
 .IP \[bu]
 Planetarian (US Edition)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ rlvm.suo @@
     /build
     /.sconf_temp
     /.sconsign.dblite
+    _site