--- a/.hgignore	Fri Jul 19 04:51:08 2013 +0300
+++ b/.hgignore	Sat Jul 27 17:23:26 2013 +0300
@@ -28,10 +28,7 @@
 glob:project_files/HedgewarsMobile/Data/
 glob:project_files/HedgewarsMobile/build/
 glob:gameServer/dist/
-glob:misc/libtremor/Xcode/build/
 glob:misc/liblua/Xcode/build/
-glob:misc/libfreetype/Xcode/build/
-glob:misc/libfreetype/Xcode-iOS/build/
 glob:misc/libphysfs/Xcode/build/
 glob:misc/libphyslayer/Xcode/build/
 glob:moc_*.cxx_parameters
@@ -65,4 +62,4 @@
 glob:version_info.txt
 glob:*.tar.*
 glob:*.or
-glob:*.res
\ No newline at end of file
+glob:*.res

--- a/CMakeLists.txt	Fri Jul 19 04:51:08 2013 +0300
+++ b/CMakeLists.txt	Sat Jul 27 17:23:26 2013 +0300
@@ -33,7 +33,6 @@
 option(MINIMAL_FLAGS "Respect system flags as much as possible (off)" OFF)
 option(NOAUTOUPDATE "Disable OS X Sparkle update checking (off)" OFF)
 
-set(FPFLAGS "" CACHE STRING "Additional Freepascal flags")
 set(GHFLAGS "" CACHE STRING "Additional Haskell flags")
 if(UNIX AND NOT APPLE)
     set(DATA_INSTALL_DIR "share/hedgewars" CACHE STRING "Resource folder path")
@@ -93,14 +92,11 @@
 
 
 #parse additional parameters
-if(FPFLAGS)
-    add_flag_prepend(CMAKE_Pascal_FLAGS ${FPFLAGS})
-endif()
 if(GHFLAGS)
     if(${CMAKE_VERSION} VERSION_GREATER 2.6)
         separate_arguments(ghflags_parsed UNIX_COMMAND ${GHFLAGS})
     else()
-        message(${WARNING} "FPFLAGS and GHFLAGS are available only when using CMake >= 2.8")
+        message(${WARNING} "GHFLAGS are available only when using CMake >= 2.8")
     endif()
 endif()
 

--- a/QTfrontend/res/html/about.html	Fri Jul 19 04:51:08 2013 +0300
+++ b/QTfrontend/res/html/about.html	Sat Jul 27 17:23:26 2013 +0300
@@ -77,7 +77,7 @@
             German: Peter Hüwe &lt;<a href="mailto:PeterHuewe@gmx.de">PeterHuewe@gmx.de</a>&gt;, Mario Liebisch &lt;<a href="mailto:mario.liebisch@gmail.com">mario.liebisch@gmail.com</a>&gt;, Richard Karolyi &lt;<a href="mailto:sheepluva@ercatec.net">sheepluva@ercatec.net</a>&gt;<br>
             Greek: &lt;<a href="mailto:talos_kriti@yahoo.gr">talos_kriti@yahoo.gr</a>&gt;<br>
             Italian: Luca Bonora &lt;<a href="mailto:bonora.luca@gmail.com">bonora.luca@gmail.com</a>&gt;, Marco Bresciani &lt;<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>&gt;<br>
-            Japanese: ADAM Etienne &lt;<a href="mailto:etienne.adam@gmail.com">etienne.adam@gmail.com</a>&gt;, Marco Bresciani &lt;<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>&gt;, 梅津洋恵<br>
+            Japanese: ADAM Etienne &lt;<a href="mailto:etienne.adam@gmail.com">etienne.adam@gmail.com</a>&gt;, Marco Bresciani &lt;<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>&gt;<br>
             Korean: Anthony Bellew &lt;<a href="mailto:anthonyreflected@gmail.com">anthonyreflected@gmail.com</a>&gt;<br>
             Lithuanian: Lukas Urbonas &lt;<a href="mailto:lukasu08@gmail.com">lukasu08@gmail.com</a>&gt;<br>
             Polish: Maciej Mroziński &lt;<a href="mailto:mynick2@o2.pl">mynick2@o2.pl</a>&gt;, Wojciech Latkowski &lt;<a href="mailto:magik17l@gmail.com">magik17l@gmail.com</a>&gt;, Piotr Mitana, Maciej Górny<br>

--- a/QTfrontend/ui/page/pagenetserver.cpp	Fri Jul 19 04:51:08 2013 +0300
+++ b/QTfrontend/ui/page/pagenetserver.cpp	Sat Jul 27 17:23:26 2013 +0300
@@ -76,7 +76,7 @@
 
     BtnShare = new QPushButton(gb);
     BtnShare->setText(QPushButton::tr("Invite your friends to your server in just 1 click!"));
-    BtnShare->setWhatsThis(QPushButton::tr("Click to copy your unique server URL in your clipboard. Send this link to your friends ands and they will be able to join you."));
+    BtnShare->setWhatsThis(QPushButton::tr("Click to copy your unique server URL to your clipboard. Send this link to your friends and they will be able to join you."));
     gbLayout->addWidget(BtnShare, 2, 1);
 
     labelURL = new QLabel(gb);

--- a/QTfrontend/ui/widget/about.cpp	Fri Jul 19 04:51:08 2013 +0300
+++ b/QTfrontend/ui/widget/about.cpp	Sat Jul 27 17:23:26 2013 +0300
@@ -39,6 +39,15 @@
 }
 #endif
 
+
+#if defined(Q_OS_WINDOWS)
+#define sopath(x) x ".dll"
+#elif defined(Q_OS_MAC)
+#define sopath(x) "@executable_path/../Frameworks/" x ".framework/" x
+#else
+#define sopath(x) "lib" x ".so"
+#endif
+
 #include "about.h"
 
 About::About(QWidget * parent) :
@@ -90,10 +99,62 @@
     libinfo.append(QString(tr("Unknown Compiler")).arg(__VERSION__) + QString("<br>"));
 #endif
 
+    const SDL_version *sdl_ver = SDL_Linked_Version();
     libinfo.append(QString("<a href=\"http://www.libsdl.org/\">SDL</a> version: %1.%2.%3<br>")
-        .arg(SDL_MAJOR_VERSION)
-        .arg(SDL_MINOR_VERSION)
-        .arg(SDL_PATCHLEVEL));
+        .arg(sdl_ver->major)
+        .arg(sdl_ver->minor)
+        .arg(sdl_ver->patch));
+
+    const SDL_version *sdlmixer_ver = Mix_Linked_Version();
+    libinfo.append(QString("<a href=\"http://www.libsdl.org/\">SDL_mixer</a> version: %1.%2.%3<br>")
+        .arg(sdlmixer_ver->major)
+        .arg(sdlmixer_ver->minor)
+        .arg(sdlmixer_ver->patch));
+
+    // the remaining sdl modules used only in engine, so instead of needlessly linking them here
+    // we dynamically call the function returning the linked version
+    void *sdlnet_handle = SDL_LoadObject(sopath("SDL_net"));
+    if (sdlnet_handle != NULL) {
+        SDL_version *(*sdlnet_ver_get)(void) = NULL;
+        sdlnet_ver_get = (SDL_version *(*)(void)) SDL_LoadFunction(sdlnet_handle, "SDLNet_Linked_Version");
+        if (sdlnet_ver_get != NULL) {
+            SDL_version *sdlnet_ver = sdlnet_ver_get();
+            libinfo.append(QString("<a href=\"http://www.libsdl.org/\">SDL_net</a> version: %1.%2.%3<br>")
+                .arg(sdlnet_ver->major)
+                .arg(sdlnet_ver->minor)
+                .arg(sdlnet_ver->patch));
+        }
+        SDL_UnloadObject(sdlnet_handle);
+    }
+
+    void *sdlimage_handle = SDL_LoadObject(sopath("SDL_image"));
+    if (sdlimage_handle != NULL) {
+        SDL_version *(*sdlimage_ver_get)(void) = NULL;
+        sdlimage_ver_get = (SDL_version *(*)(void)) SDL_LoadFunction(sdlimage_handle, "IMG_Linked_Version");
+        if (sdlimage_ver_get != NULL) {
+            SDL_version *sdlimage_ver = sdlimage_ver_get();
+            libinfo.append(QString("<a href=\"http://www.libsdl.org/\">SDL_image</a> version: %1.%2.%3<br>")
+                .arg(sdlimage_ver->major)
+                .arg(sdlimage_ver->minor)
+                .arg(sdlimage_ver->patch));
+        }
+        SDL_UnloadObject(sdlnet_handle);
+    }
+
+    void *sdlttf_handle = SDL_LoadObject(sopath("SDL_ttf"));
+    if (sdlttf_handle != NULL) {
+        SDL_version *(*sdlttf_ver_get)(void) = NULL;
+        sdlttf_ver_get = (SDL_version *(*)(void)) SDL_LoadFunction(sdlttf_handle, "TTF_Linked_Version");
+        if (sdlttf_ver_get != NULL) {
+            SDL_version *sdlttf_ver = sdlttf_ver_get();
+            libinfo.append(QString("<a href=\"http://www.libsdl.org/\">SDL_ttf</a> version: %1.%2.%3<br>")
+                .arg(sdlttf_ver->major)
+                .arg(sdlttf_ver->minor)
+                .arg(sdlttf_ver->patch));
+        }
+        SDL_UnloadObject(sdlnet_handle);
+    }
+
 
     libinfo.append(QString("<a href=\"http://qt-project.org/\">Qt</a> version: %1<br>").arg(QT_VERSION_STR));
 
@@ -109,6 +170,8 @@
         .arg(PHYSFS_VER_MINOR)
         .arg(PHYSFS_VER_PATCH));
 
+    // TODO: how to add Lua information?
+
     QLabel * lblLibInfo = new QLabel();
     lblLibInfo->setOpenExternalLinks(true);
     lblLibInfo->setText(libinfo);

--- a/QTfrontend/ui/widget/feedbackdialog.cpp	Fri Jul 19 04:51:08 2013 +0300
+++ b/QTfrontend/ui/widget/feedbackdialog.cpp	Sat Jul 27 17:23:26 2013 +0300
@@ -257,27 +257,24 @@
         case QSysInfo::WV_2003: os_version += "Windows Server 2003\n"; break;
         case QSysInfo::WV_VISTA: os_version += "Windows Vista\n"; break;
         case QSysInfo::WV_WINDOWS7: os_version += "Windows 7\n"; break;
-        //case QSysInfo::WV_WINDOWS8: os_version += "Windows 8\n"; break; //QT 5+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+        case QSysInfo::WV_WINDOWS8: os_version += "Windows 8\n"; break;
+#endif
         default: os_version += "Windows (Unknown version)\n"; break;
     }
     kernel_line += "Windows kernel\n";
 #endif
-#ifdef Q_OS_X11
+#ifdef Q_OS_LINUX
     number_of_cores += QString::number(sysconf(_SC_NPROCESSORS_ONLN)) + "\n";
-    long pages = sysconf(_SC_PHYS_PAGES),
-/*
-#ifndef Q_OS_FREEBSD
-         available_pages = sysconf(_SC_AVPHYS_PAGES),
-#else
-         available_pages = 0,
-#endif*/
-    page_size = sysconf(_SC_PAGE_SIZE);
-    total_ram += QString::number(pages*page_size/1024/1024) + " MB\n";
+    quint32 pages = sysconf(_SC_PHYS_PAGES);
+    quint32 page_size = sysconf(_SC_PAGE_SIZE);
+    quint32 total = pages * page_size / 1024 / 1024;
+    total_ram += QString::number(total) + " MB\n";
     os_version += "GNU/Linux or BSD\n";
 #endif
 
     // uname -a
-#if defined(Q_OS_X11) || defined(Q_OS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
     QProcess *process = new QProcess();
     QStringList arguments = QStringList("-a");
     process->start("uname", arguments);

--- a/cmake_modules/CMakePascalInformation.cmake	Fri Jul 19 04:51:08 2013 +0300
+++ b/cmake_modules/CMakePascalInformation.cmake	Sat Jul 27 17:23:26 2013 +0300
@@ -33,31 +33,33 @@
 # so if these are not set just copy the flags from the c version
 
 # No flags supported during linking as a shell script takes care of it
+# however to avoid interferences we escape -Wl flags to the Pascal -k
 if(NOT CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS)
-#-dynamiclib -Wl,-headerpad_max_install_names for C
-    set(CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+#-shared
+    string(REGEX REPLACE "-Wl," "-k" CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
 endif(NOT CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS)
 
-if(NOT CMAKE_SHARED_LIBRARY_Pascal_FLAGS)
-    #another similarity, fpc: -fPIC  Same as -Cg
-    #(maybe required only for x86_64)
-    set(CMAKE_SHARED_LIBRARY_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
-endif(NOT CMAKE_SHARED_LIBRARY_Pascal_FLAGS)
+if(NOT CMAKE_SHARED_LIBRARY_Pascal_FLAGS AND CMAKE_SHARED_LIBRARY_C_FLAGS)
+    string(REGEX REPLACE "-Wl," "-k" CMAKE_SHARED_LIBRARY_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+endif()
+
+if(NOT CMAKE_SHARED_LIBRARY_LINK_Pascal_FLAGS AND CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)
+#-rdynamic
+    string(REGEX REPLACE "-Wl," "-k" CMAKE_SHARED_LIBRARY_LINK_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
+endif()
 
-if(NOT CMAKE_SHARED_LIBRARY_LINK_Pascal_FLAGS)
-    set(CMAKE_SHARED_LIBRARY_LINK_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
-endif(NOT CMAKE_SHARED_LIBRARY_LINK_Pascal_FLAGS)
+if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG)
+#-Wl,-rpath,
+    set(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG "-k-rpath")
+endif(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG)
 
-#if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG)
-#    set(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
-#endif(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG)
-
-#if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP)
-#    set(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
-#endif(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP)
+if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP)
+    set(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
+endif(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP)
 
 if(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Pascal_FLAG)
-    set(CMAKE_SHARED_LIBRARY_RPATH_LINK_Pascal_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
+#-Wl,-rpath-link,
+    set(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG "-k-rpath-link")
 endif(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Pascal_FLAG)
 
 # for most systems a module is the same as a shared library
@@ -70,12 +72,12 @@
 
 # repeat for modules
 if(NOT CMAKE_SHARED_MODULE_CREATE_Pascal_FLAGS)
-    set(CMAKE_SHARED_MODULE_CREATE_Pascal_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
+    string(REGEX REPLACE "-Wl," "-k" CMAKE_SHARED_MODULE_CREATE_Pascal_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
 endif(NOT CMAKE_SHARED_MODULE_CREATE_Pascal_FLAGS)
 
-if(NOT CMAKE_SHARED_MODULE_Pascal_FLAGS)
-    set(CMAKE_SHARED_MODULE_Pascal_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
-endif(NOT CMAKE_SHARED_MODULE_Pascal_FLAGS)
+if(NOT CMAKE_SHARED_MODULE_Pascal_FLAGS AND CMAKE_SHARED_MODULE_C_FLAGS)
+    string(REGEX REPLACE "-Wl," "-k" CMAKE_SHARED_MODULE_Pascal_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
+endif()
 
 if(NOT CMAKE_SHARED_MODULE_RUNTIME_Pascal_FLAG)
     set(CMAKE_SHARED_MODULE_RUNTIME_Pascal_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
@@ -101,7 +103,7 @@
 
 set(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
 
-set(CMAKE_Pascal_FLAGS "$ENV{FPFLAGS} ${CMAKE_Pascal_FLAGS_INIT} ${CMAKE_Pascal_FLAGS}" CACHE STRING "Flags for Pascal compiler.")
+set(CMAKE_Pascal_FLAGS "$ENV{FPFLAGS} ${CMAKE_Pascal_FLAGS_INIT} ${CMAKE_Pascal_FLAGS}" CACHE STRING "Flags for Pascal compiler." FORCE)
 
 include(CMakeCommonLanguageInclude)
 
@@ -161,16 +163,25 @@
     if(UNIX)
         #when you have multiple ld installation make sure you get the one bundled with the system C compiler
         include(Platform/${CMAKE_SYSTEM_NAME}-GNU-C.cmake OPTIONAL)
-        if(CMAKE_C_COMPILER)
+        if(CMAKE_COMPILER_IS_GNUCC)
             get_filename_component(CMAKE_C_COMPILER_DIR ${CMAKE_C_COMPILER} PATH)
             set(CMAKE_Pascal_UNIX_FLAGS "-FD${CMAKE_C_COMPILER_DIR}")
-        endif(CMAKE_C_COMPILER)
+        endif(CMAKE_COMPILER_IS_GNUCC)
         if(APPLE)
-            #add user framework directory
-            set(CMAKE_Pascal_UNIX_FLAGS "-Ff~/Library/Frameworks ${CMAKE_Pascal_UNIX_FLAGS}")
+            #TODO: take care of CMAKE_INSTALL_NAME_DIR for shared targets
+        else(APPLE)
+            if(CMAKE_INSTALL_RPATH)
+                #need to escape twice because we use a script to link
+                #\\\\ is just \\ which escapes '\' in the final script
+                #same for $$ which escapes '$' in cmake
+                string(REGEX REPLACE "\\$" "\\\\$$" CMAKE_INSTALL_RPATH_ESCAPED ${CMAKE_INSTALL_RPATH})
+                #normally this flag is found in <LINK_LIBRARIES> but that's not active here
+                set(CMAKE_Pascal_UNIX_FLAGS "${CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG} -k'${CMAKE_INSTALL_RPATH_ESCAPED}' ${CMAKE_Pascal_UNIX_FLAGS}")
+            endif()
         endif(APPLE)
     endif(UNIX)
 
+    #-Cn is mandatory as it's what creates the ppas.* script
     set(CMAKE_Pascal_COMPILE_OBJECT
         "<CMAKE_Pascal_COMPILER> -Cn -FE${EXECUTABLE_OUTPUT_PATH} -FU${CMAKE_CURRENT_BINARY_DIR}/<OBJECT_DIR> ${CMAKE_Pascal_UNIX_FLAGS} <FLAGS> <SOURCE>")
 endif(NOT CMAKE_Pascal_COMPILE_OBJECT)

--- a/cmake_modules/compilerchecks.cmake	Fri Jul 19 04:51:08 2013 +0300
+++ b/cmake_modules/compilerchecks.cmake	Sat Jul 27 17:23:26 2013 +0300
@@ -8,70 +8,83 @@
 # CMAKE_SHARED_LIBRARY_<lang>_FLAGS same but for shared libraries
 
 #TODO: should there be two different checks for C and CXX?
+#TODO: can the various if(platform) be avoided in some way?
 
-#stack protection, when found it needs to go in the linker flags too
-#it is disabled on win32 because it adds a dll and messes with linker
-#some bsd installations reported problems too
-#(see 822312 654424 on bugzilla.redhat.com)
-check_c_compiler_flag("-fstack-protector-all -fstack-protector" HAVE_STACKPROTECTOR)
-if(HAVE_STACKPROTECTOR AND ((NOT WIN32) OR (CMAKE_SYSTEM_NAME MATCHES BSD.OS)))
-    add_flag_append(CMAKE_C_FLAGS "-fstack-protector-all -fstack-protector")
-    add_flag_append(CMAKE_CXX_FLAGS "-fstack-protector-all -fstack-protector")
-    add_flag_append(CMAKE_EXE_LINKER_FLAGS "-fstack-protector-all -fstack-protector")
-    add_flag_append(CMAKE_SHARED_LIBRARY_C_FLAGS "-fstack-protector-all -fstack-protector")
-    add_flag_append(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fstack-protector-all -fstack-protector")
-endif()
 
-#symbol visibility, not supported on Windows
-check_c_compiler_flag("-fvisibility=hidden" HAVE_VISIBILITY)
-if(HAVE_VISIBILITY AND (NOT WIN32))
-    add_flag_append(CMAKE_C_FLAGS "-fvisibility=hidden")
-    add_flag_append(CMAKE_CXX_FLAGS "-fvisibility=hidden")
+if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES BSD.OS) OR (CMAKE_SYSTEM_NAME MATCHES FreeBSD)))
+    #stack protection, when found it needs to go in the linker flags too
+    #it is disabled on win32 because it adds a dll and messes with linker
+    #some bsd installations reported problems too
+    #(see 822312 654424 on bugzilla.redhat.com)
+    check_c_compiler_flag("-fstack-protector-all -fstack-protector" HAVE_STACKPROTECTOR)
+    if(HAVE_STACKPROTECTOR)
+        add_flag_append(CMAKE_C_FLAGS "-fstack-protector-all -fstack-protector")
+        add_flag_append(CMAKE_CXX_FLAGS "-fstack-protector-all -fstack-protector")
+    endif()
 endif()
 
 
-#check for noexecstack on ELF, Gentoo security
-set(CMAKE_REQUIRED_FLAGS "-Wl,-z,noexecstack")
-check_c_compiler_flag("" HAVE_NOEXECSTACK)
-if(HAVE_NOEXECSTACK)
-    add_linker_flag("-znoexecstack")
-endif()
+
+if(UNIX)
+    #symbol visibility
+    check_c_compiler_flag("-fvisibility=hidden" HAVE_VISIBILITY)
+    if(HAVE_VISIBILITY)
+        add_flag_append(CMAKE_C_FLAGS "-fvisibility=hidden")
+        add_flag_append(CMAKE_CXX_FLAGS "-fvisibility=hidden")
+    endif()
 
-#check for full relro on ELF, Debian security
-set(CMAKE_REQUIRED_FLAGS "-Wl,-zrelro,-znow")
-check_c_compiler_flag("" HAVE_RELROFULL)
-if(HAVE_RELROFULL)
-    add_linker_flag("-zrelro")
-    add_linker_flag("-znow")
-else()
-    #if full relro is not available, try partial relro
-    set(CMAKE_REQUIRED_FLAGS "-Wl,-zrelro")
-    check_c_compiler_flag("" HAVE_RELROPARTIAL)
-    if(HAVE_RELROPARTIAL)
-        add_linker_flag("-zrelro")
+    #check for noexecstack on ELF, Gentoo security
+    set(CMAKE_REQUIRED_FLAGS "-Wl,-znoexecstack")
+    check_c_compiler_flag("" HAVE_NOEXECSTACK)
+    if(HAVE_NOEXECSTACK)
+        add_linker_flag("-znoexecstack")
+    endif()
+
+    #check for origin on ELF, BSD $ORIGIN support
+    set(CMAKE_REQUIRED_FLAGS "-Wl,-zorigin")
+    check_c_compiler_flag("" HAVE_ORIGIN)
+    if(HAVE_ORIGIN)
+        add_linker_flag("-zorigin")
     endif()
-endif()
 
-#check for ASLR on Windows Vista or later, requires binutils >= 2.20
-set(CMAKE_REQUIRED_FLAGS "-Wl,--nxcompat")
-check_c_compiler_flag("" HAVE_WINASLR)
-if(HAVE_WINASLR)
-    add_linker_flag("--nxcompat")
-endif()
+    #check for full relro on ELF, Debian security
+    set(CMAKE_REQUIRED_FLAGS "-Wl,-zrelro,-znow")
+    check_c_compiler_flag("" HAVE_RELROFULL)
+    if(HAVE_RELROFULL)
+        add_linker_flag("-zrelro")
+        add_linker_flag("-znow")
+    else()
+        #if full relro is not available, try partial relro
+        set(CMAKE_REQUIRED_FLAGS "-Wl,-zrelro")
+        check_c_compiler_flag("" HAVE_RELROPARTIAL)
+        if(HAVE_RELROPARTIAL)
+            add_linker_flag("-zrelro")
+        endif()
+    endif()
 
-#check for DEP on Windows XP SP2 or later, requires binutils >= 2.20
-set(CMAKE_REQUIRED_FLAGS "-Wl,--dynamicbase")
-check_c_compiler_flag("" HAVE_WINDEP)
-if(HAVE_WINDEP)
-    add_linker_flag("--dynamicbase")
-endif()
+    if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
+        set(CMAKE_REQUIRED_FLAGS "-Wl,--as-needed")
+        check_c_compiler_flag("" HAVE_ASNEEDED)
+        if(HAVE_ASNEEDED)
+            add_linker_flag("--as-needed")
+        endif()
+    endif()
+else(UNIX)
+    #check for ASLR on Windows Vista or later, requires binutils >= 2.20
+    set(CMAKE_REQUIRED_FLAGS "-Wl,--nxcompat")
+    check_c_compiler_flag("" HAVE_WINASLR)
+    if(HAVE_WINASLR)
+        add_linker_flag("--nxcompat")
+    endif()
 
-#this is actually an optimisation
-set(CMAKE_REQUIRED_FLAGS "-Wl,--as-needed")
-check_c_compiler_flag("" HAVE_ASNEEDED)
-if(HAVE_ASNEEDED)
-    add_linker_flag("--as-needed")
-endif()
+    #check for DEP on Windows XP SP2 or later, requires binutils >= 2.20
+    set(CMAKE_REQUIRED_FLAGS "-Wl,--dynamicbase")
+    check_c_compiler_flag("" HAVE_WINDEP)
+    if(HAVE_WINDEP)
+        add_linker_flag("--dynamicbase")
+    endif()
+endif(UNIX)
+
 
 #always unset or these flags will be spread everywhere
 unset(CMAKE_REQUIRED_FLAGS)

--- a/cmake_modules/cpackvars.cmake	Fri Jul 19 04:51:08 2013 +0300
+++ b/cmake_modules/cpackvars.cmake	Sat Jul 27 17:23:26 2013 +0300
@@ -84,12 +84,9 @@
     "cmake_uninstall\\\\.cmake$"
     "CMakeCache\\\\.txt$"
     "build_windows_.*\\\\.bat$"
-#    "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor"
-#    "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype"
-#    "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua"
+    "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua"
 #    "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/frontlib"
 #    "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/cmdlineClient"
-    "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
     "^${CMAKE_CURRENT_SOURCE_DIR}/misc/winutils/bin"
     "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/promotional_art"
     "^${CMAKE_CURRENT_SOURCE_DIR}/tools/templates"

--- a/cmake_modules/paths.cmake	Fri Jul 19 04:51:08 2013 +0300
+++ b/cmake_modules/paths.cmake	Sat Jul 27 17:23:26 2013 +0300
@@ -51,27 +51,16 @@
 #it's safe to use our RPATH because it is relative
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 
+#add the automatically determined parts of the RPATH
+#which point to directories outside the build tree to the install RPATH
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+
 #paths where to find libraries (final slash not optional):
 # - the first is relative to the executable
 # - the second is the same directory of the executable (so it runs in bin/)
 # - the third one is the full path of the system dir
 #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
 set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
-#\\\\ is just \\ which escapes '\' in the final script; same for $$ which escapes '$' in cmake
-set(CMAKE_INSTALL_RPATH_ESCAPED "\\\\$$ORIGIN/../${target_library_install_dir}/:\\\\$$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
-
-if(UNIX AND NOT APPLE)
-    #make sure $ORIGIN is respected
-    add_linker_flag("-zorigin")
-    #apply RPATH settings to pascal executables
-    add_flag_append(CMAKE_Pascal_FLAGS "-k-rpath -k'${CMAKE_INSTALL_RPATH_ESCAPED}'")
-    #until we link with external things there is no need to set rpath on haskell
-    #list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED}'")
-endif()
-
-#add the automatically determined parts of the RPATH
-#which point to directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 
 
 #install_name_tool magic for OS X

--- a/cmake_modules/platform.cmake	Fri Jul 19 04:51:08 2013 +0300
+++ b/cmake_modules/platform.cmake	Sat Jul 27 17:23:26 2013 +0300
@@ -89,6 +89,9 @@
         add_flag_append(CMAKE_Pascal_FLAGS "-XR${CMAKE_OSX_SYSROOT}")
         add_flag_append(CMAKE_Pascal_FLAGS "-k-macosx_version_min -k${minimum_macosx_version}")
     endif()
+
+    #add user framework directory
+    add_flag_append(CMAKE_Pascal_FLAGS "-Ff~/Library/Frameworks")
 endif(APPLE)
 
 if(MINGW)

--- a/cmake_modules/utils.cmake	Fri Jul 19 04:51:08 2013 +0300
+++ b/cmake_modules/utils.cmake	Sat Jul 27 17:23:26 2013 +0300
@@ -37,10 +37,14 @@
 
 macro(add_linker_flag _FLAG)
     list(APPEND haskell_flags "-optl" "-Wl,${_FLAG}")
-    add_flag_append(CMAKE_Pascal_FLAGS "-k${_FLAG}")
-    add_flag_append(CMAKE_EXE_LINKER_FLAGS "-Wl,${_FLAG}")
+    #executables
+    add_flag_append(CMAKE_C_LINK_FLAGS "-Wl,${_FLAG}")
+    add_flag_append(CMAKE_CXX_LINK_FLAGS "-Wl,${_FLAG}")
+    add_flag_append(CMAKE_Pascal_LINK_FLAGS "-k${_FLAG}")
+    #libraries
     add_flag_append(CMAKE_SHARED_LIBRARY_C_FLAGS "-Wl,${_FLAG}")
     add_flag_append(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-Wl,${_FLAG}")
+    #CMAKE_SHARED_LIBRARY_Pascal_FLAGS is already set by CMAKE_Pascal_LINK_FLAGS
 endmacro(add_linker_flag _FLAG)
 
 #TODO: find_package_or_bundle

--- a/hedgewars/ArgParsers.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/ArgParsers.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -21,11 +21,15 @@
 unit ArgParsers;
 interface
 
+{$IFNDEF HWLIBRARY}
 procedure GetParams;
+{$ELSE}
+procedure parseCommandLine(argc: LongInt; argv: PPChar);
+{$ENDIF}
 
 implementation
 uses uVariables, uTypes, uUtils, uSound, uConsts;
-var isInternal: Boolean;
+var isInternal: Boolean {$IFDEF HWLIBRARY} = true{$ENDIF};
 
 procedure GciEasterEgg;
 begin

--- a/hedgewars/CMakeLists.txt	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/CMakeLists.txt	Sat Jul 27 17:23:26 2013 +0300
@@ -163,7 +163,7 @@
 
 #SOURCE AND PROGRAMS SECTION
 if(BUILD_ENGINE_LIBRARY)
-    message(${WARNING} "Engine will be built as library (experimental)")
+    message("***Engine will be built as library (experimental)***")
     if(APPLE AND current_macosx_version VERSION_GREATER "10.5")
         # due to compiler/linker issues on Max OS X 10.6 -k-no_order_inits is needed to avoid linking fail
         add_flag_prepend(CMAKE_Pascal_FLAGS "-k-no_order_inits")

--- a/hedgewars/SDLh.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/SDLh.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -89,20 +89,22 @@
 /////////////////////////////////////////////////////////////////
 
     // SDL_Init() flags
-    SDL_INIT_TIMER       = $00000001;
-    SDL_INIT_AUDIO       = $00000010;
-    SDL_INIT_VIDEO       = $00000020;
-    SDL_INIT_JOYSTICK    = $00000200;
-{$IFDEF SDL13}
-    SDL_INIT_HAPTIC      = $00001000;
+    SDL_INIT_TIMER          = $00000001;
+    SDL_INIT_AUDIO          = $00000010;
+    SDL_INIT_VIDEO          = $00000020; // implies SDL_INIT_EVENTS (sdl2)
+    SDL_INIT_JOYSTICK       = $00000200; // implies SDL_INIT_EVENTS (sdl2)
+{$IFDEF SDL2}
+    SDL_INIT_HAPTIC         = $00001000;
+    SDL_INIT_GAMECONTROLLER = $00002000; // implies SDL_INIT_JOYSTICK
+    SDL_INIT_EVENTS         = $00004000;
 {$ELSE}
-    SDL_INIT_CDROM       = $00000100;
-    SDL_INIT_EVENTTHREAD = $01000000;
+    SDL_INIT_CDROM          = $00000100;
+    SDL_INIT_EVENTTHREAD    = $01000000;
 {$ENDIF}
-    SDL_INIT_NOPARACHUTE = $00100000;
-    SDL_INIT_EVERYTHING  = $0000FFFF;
+    SDL_INIT_NOPARACHUTE    = $00100000;
+    //SDL_INIT_EVERYTHING                // unsafe, init subsystems one at a time
 
-    SDL_ALLEVENTS        = $FFFFFFFF;
+    SDL_ALLEVENTS        = $FFFFFFFF;    // dummy event type to prevent stack corruption
     SDL_APPINPUTFOCUS    = $02;
 
     SDL_BUTTON_LEFT      = 1;
@@ -111,10 +113,20 @@
     SDL_BUTTON_WHEELUP   = 4;
     SDL_BUTTON_WHEELDOWN = 5;
 
-{$IFDEF SDL13}
+
+{$IFDEF SDL2}
     // SDL_Event types
-    SDL_FIRSTEVENT        = 0;
+    // pascal does not support unions as is, so we list here every possible event
+    // and later associate a struct type each
+    SDL_FIRSTEVENT        = 0;              // type
+    SDL_COMMONDEVENT      = 1;              // type and timestamp
     SDL_QUITEV            = $100;
+    SDL_APP_TERMINATING   = $101;
+    SDL_APP_LOWMEMORY     = $102;
+    SDL_APP_WILLENTERBACKGROUND = $103;
+    SDL_APP_DIDENTERBACKGROUND = $104;
+    SDL_APP_WILLENTERFOREGROUND = $105;
+    SDL_APP_DIDENTERFOREGROUND = $106;
     SDL_WINDOWEVENT       = $200;
     SDL_SYSWMEVENT        = $201;
     SDL_KEYDOWN           = $300;
@@ -125,22 +137,22 @@
     SDL_MOUSEBUTTONDOWN   = $401;
     SDL_MOUSEBUTTONUP     = $402;
     SDL_MOUSEWHEEL        = $403;
-    SDL_INPUTMOTION       = $500;
-    SDL_INPUTBUTTONDOWN   = $501;
-    SDL_INPUTBUTTONUP     = $502;
-    SDL_INPUTWHEEL        = $503;
-    SDL_INPUTPROXIMITYIN  = $504;
-    SDL_INPUTPROXIMITYOUT = $505;
     SDL_JOYAXISMOTION     = $600;
     SDL_JOYBALLMOTION     = $601;
     SDL_JOYHATMOTION      = $602;
     SDL_JOYBUTTONDOWN     = $603;
     SDL_JOYBUTTONUP       = $604;
+    SDL_JOYDEVICEADDED    = $605;
+    SDL_JOYDEVICEREMOVED  = $606;
+    SDL_CONTROLLERAXISMOTION = $650;
+    SDL_CONTROLLERBUTTONDOWN = $651;
+    SDL_CONTROLLERBUTTONUP = $652;
+    SDL_CONTROLLERDEVICEADDED = $653;
+    SDL_CONTROLLERDEVICEREMOVED = $654;
+    SDL_CONTROLLERDEVICEREMAPPED = $655;
     SDL_FINGERDOWN        = $700;
     SDL_FINGERUP          = $701;
     SDL_FINGERMOTION      = $702;
-    SDL_TOUCHBUTTONDOWN   = $703;
-    SDL_TOUCHBUTTONUP     = $704;
     SDL_DOLLARGESTURE     = $800;
     SDL_DOLLARRECORD      = $801;
     SDL_MULTIGESTURE      = $802;
@@ -148,33 +160,21 @@
     SDL_DROPFILE          = $1000;
     SDL_USEREVENT         = $8000;
     SDL_LASTEVENT         = $FFFF;
-    // no compatibility events $7000
 
     // SDL_Surface flags
     SDL_SWSURFACE   = $00000000;  //*< Not used */
     SDL_PREALLOC    = $00000001;  //*< Surface uses preallocated memory */
     SDL_RLEACCEL    = $00000002;  //*< Surface is RLE encoded */
     SDL_DONTFREE    = $00000004;  //*< Surface is referenced internally */
-    SDL_SRCALPHA    = $00010000;
-    SDL_SRCCOLORKEY = $00020000;
-    SDL_ANYFORMAT   = $00100000;
-    SDL_HWPALETTE   = $00200000;
-    SDL_DOUBLEBUF   = $00400000;
-    SDL_FULLSCREEN  = $00800000;
-    SDL_RESIZABLE   = $01000000;
-    SDL_NOFRAME     = $02000000;
-    SDL_OPENGL      = $04000000;
-    SDL_HWSURFACE   = $08000001;  //*< Not used */
-    SDL_ASYNCBLIT   = $08000000;  //*< Not used */
-    SDL_RLEACCELOK  = $08000000;  //*< Not used */
-    SDL_HWACCEL     = $08000000;  //*< Not used */
+    SDL_SRCCOLORKEY = $00020000;  // compatibility only
 
-    // SDL_Renderer flags
+    // SDL_RendererFlags
     SDL_RENDERER_SOFTWARE     = $00000001;     //*< The renderer is a software fallback */
     SDL_RENDERER_ACCELERATED  = $00000002;     //*< The renderer uses hardware acceleration */
-    SDL_RENDERER_PRESENTVSYNC = $00000004;
+    SDL_RENDERER_PRESENTVSYNC = $00000004;     //*< Present is synchronized with the refresh rate */
+    SDL_RENDERER_TARGETTEXTURE = $00000008;    //*< The renderer supports rendering to texture */
 
-    // SDL_WindowFlags (enum)
+    // SDL_WindowFlags
     SDL_WINDOW_FULLSCREEN    = $00000001;      //*< fullscreen window, implies borderless */
     SDL_WINDOW_OPENGL        = $00000002;      //*< window usable with OpenGL context */
     SDL_WINDOW_SHOWN         = $00000004;      //*< window is visible */
@@ -186,11 +186,12 @@
     SDL_WINDOW_INPUT_GRABBED = $00000100;      //*< window has grabbed input focus */
     SDL_WINDOW_INPUT_FOCUS   = $00000200;      //*< window has input focus */
     SDL_WINDOW_MOUSE_FOCUS   = $00000400;      //*< window has mouse focus */
+    SDL_WINDOW_FULLSCREEN_DESKTOP = $00001001; //*< fullscreen as maximed window */
     SDL_WINDOW_FOREIGN       = $00000800;      //*< window not created by SDL */
 
     SDL_WINDOWPOS_CENTERED_MASK = $2FFF0000;
 
-    // SDL_WindowEventID (enum)
+    // SDL_WindowEventID
     SDL_WINDOWEVENT_NONE         = 0;    //*< Never used
     SDL_WINDOWEVENT_SHOWN        = 1;    //*< Window has been shown
     SDL_WINDOWEVENT_HIDDEN       = 2;    //*< Window has been hidden
@@ -308,6 +309,7 @@
     SDLK_q         = 113;
     SDLK_w         = 119;
     SDLK_DELETE    = 127;
+    SDLK_KP_ENTER  = 271;
     SDLK_UP        = 273;
     SDLK_DOWN      = 274;
     SDLK_RIGHT     = 275;
@@ -327,18 +329,20 @@
 // http://www.freepascal.org/docs-html/prog/progsu144.html
 
 type
-{$IFDEF SDL13}
+{$IFDEF SDL2}
     PSDL_Window   = Pointer;
     PSDL_Renderer = Pointer;
     PSDL_Texture  = Pointer;
     PSDL_GLContext= Pointer;
-    TSDL_FingerId = Int64;
     TSDL_TouchId  = Int64;
 {$ENDIF}
+    TSDL_FingerId = Int64;
+
+    TSDL_eventaction = (SDL_ADDEVENT, SDL_PEEPEVENT, SDL_GETEVENT);
 
     PSDL_Rect = ^TSDL_Rect;
     TSDL_Rect = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         x, y, w, h: LongInt;
 {$ELSE}
         x, y: SmallInt;
@@ -347,12 +351,12 @@
         end;
 
     TPoint = record
-        X, Y: LongInt;
+        x, y: LongInt;
         end;
 
     PSDL_PixelFormat = ^TSDL_PixelFormat;
     TSDL_PixelFormat = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         format: LongWord;
         palette: Pointer;
         BitsPerPixel : Byte;
@@ -393,23 +397,22 @@
 {$ENDIF}
         end;
 
-    TSDL_eventaction = (SDL_ADDEVENT, SDL_PEEPEVENT, SDL_GETEVENT);
-
     PSDL_Surface = ^TSDL_Surface;
     TSDL_Surface = record
         flags : LongWord;
         format: PSDL_PixelFormat;
         w, h  : LongInt;
-        pitch : {$IFDEF SDL13}LongInt{$ELSE}Word{$ENDIF};
+        pitch : {$IFDEF SDL2}LongInt{$ELSE}Word{$ENDIF};
         pixels: Pointer;
-        offset: LongInt;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         userdata: Pointer;
         locked: LongInt;
         lock_data: Pointer;
         clip_rect: TSDL_Rect;
         map: Pointer;
         refcount: LongInt;
+{$ELSE}
+        offset: LongInt;
 {$ENDIF}
         end;
 
@@ -419,18 +422,24 @@
             r: Byte;
             g: Byte;
             b: Byte;
-            unused: Byte;
+            a: Byte; //sdl12 name is 'unused' but as long as size matches...
         end;
 
 
+    (* SDL_RWops and friends *)
     PSDL_RWops = ^TSDL_RWops;
+{$IFDEF SDL2}
+    TSize  = function( context: PSDL_RWops): Int64; cdecl;
+    TSeek  = function( context: PSDL_RWops; offset: Int64; whence: LongInt ): Int64; cdecl;
+{$ELSE}
     TSeek  = function( context: PSDL_RWops; offset: LongInt; whence: LongInt ): LongInt; cdecl;
+{$ENDIF}
     TRead  = function( context: PSDL_RWops; Ptr: Pointer; size: LongInt; maxnum : LongInt ): LongInt;  cdecl;
     TWrite = function( context: PSDL_RWops; Ptr: Pointer; size: LongInt; num: LongInt ): LongInt; cdecl;
     TClose = function( context: PSDL_RWops ): LongInt; cdecl;
 
     TStdio = record
-        autoclose: {$IFDEF SDL13}Boolean{$ELSE}LongInt{$ENDIF};
+        autoclose: {$IFDEF SDL2}Boolean{$ELSE}LongInt{$ENDIF};
         fp: Pointer;
         end;
 
@@ -442,29 +451,63 @@
 
     TUnknown = record
         data1: Pointer;
+{$IFDEF SDL2}
+        data2: Pointer;
+{$ENDIF}
         end;
 
+{$IFDEF ANDROID}
+    TAndroidio = record
+        fileName, inputStream, readableByteChannel: Pointer;
+        readMethod, assetFileDescriptor: Pointer;
+        position, size, offset: Int64;
+        fd: LongInt;
+        end;
+{$ELSE}
+{$IFDEF WIN32}
+    TWinbuffer = record
+        data: Pointer;
+        size, left: LongInt;
+        end;
+    TWindowsio = record
+        append : {$IFDEF SDL2}Boolean{$ELSE}LongInt{$ENDIF};
+        h : Pointer;
+        buffer : TWinbuffer;
+        end;
+{$ENDIF}
+{$ENDIF}
+
     TSDL_RWops = record
+{$IFDEF SDL2}
+        size: TSize;
+{$ENDIF}
         seek: TSeek;
         read: TRead;
         write: TWrite;
         close: TClose;
         type_: LongWord;
         case Byte of
-            0: (stdio: TStdio);
-            1: (mem: TMem);
-            2: (unknown: TUnknown);
+{$IFDEF ANDROID}
+            0: (androidio: TAndroidio);
+{$ELSE}
+{$IFDEF WIN32}
+            0: (windowsio: TWindowsio);
+{$ENDIF}
+{$ENDIF}
+            1: (stdio: TStdio);     // assumes HAVE_STDIO_H
+            2: (mem: TMem);
+            3: (unknown: TUnknown);
             end;
 
 
 {* SDL_Event type definition *}
 
-{$IFDEF SDL13}
-    TSDL_KeySym = record
+{$IFDEF SDL2}
+    TSDL_Keysym = record
         scancode: LongInt;
-        sym: LongWord;
+        sym: LongInt;
         modifier: Word;
-        unicode: LongWord;
+        unused: LongWord;
         end;
 
     TSDL_WindowEvent = record
@@ -496,27 +539,15 @@
     TSDL_TouchFingerEvent = record
         type_: LongWord;
         timestamp: LongWord;
-        windowId: LongWord;
         touchId: TSDL_TouchId;
         fingerId: TSDL_FingerId;
-        state, padding1, padding2, padding3: Byte;
-        x, y: Word;
-        dx, dy: SmallInt;
-        pressure: Word;
-        end;
-
-    TSDL_TouchButtonEvent = record
-        type_: LongWord;
-        timestamp: LongWord;
-        windowId: LongWord;
-        touchId: TSDL_TouchId;
-        state, button, padding1, padding2: Byte;
+        x, y, dx, dy: Single;
+        pressure: Single;
         end;
 
     TSDL_MultiGestureEvent = record
         type_: LongWord;
         timestamp: LongWord;
-        windowId: LongWord;
         touchId: TSDL_TouchId;
         dTheta, dDist, x, y: Single;
         numFingers, padding: Word;
@@ -525,11 +556,10 @@
     TSDL_DollarGestureEvent = record
         type_: LongWord;
         timestamp: LongWord;
-        windowId: LongWord;
         touchId: Int64;
         gesturedId: Int64;
         numFingers: LongWord;
-        error: Single;
+        error, x, y: Single;
         end;
 
     TSDL_DropEvent = record
@@ -543,6 +573,37 @@
         timestamp: LongWord;
         msg: Pointer;
         end;
+
+    TSDL_ControllerAxisEvent = record
+        type_: LongWord;
+        timestamp: LongWord;
+        which: LongInt;
+        axis, padding1, padding2, padding3: Byte;
+        value: SmallInt;
+        padding4: Word;
+        end;
+
+    TSDL_ControllerButtonEvent = record
+        type_: LongWord;
+        timestamp: LongWord;
+        which: LongInt;
+        button, states, padding1, padding2: Byte;
+        end;
+
+    TSDL_ControllerDeviceEvent = record
+        type_: LongWord;
+        timestamp: LongWord;
+        which: SmallInt;
+        end;
+
+    TSDL_JoyDeviceEvent = TSDL_ControllerDeviceEvent;
+
+    TSDL_CommonEvent = record
+        type_: LongWord;
+        timestamp: LongWord;
+        end;
+
+    TSDL_OSEvent = TSDL_CommonEvent;
 {$ELSE}
     TSDL_KeySym = record
         scancode: Byte;
@@ -564,35 +625,36 @@
 {$ENDIF}
 
     TSDL_KeyboardEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
-//        timestamp: LongWord;
+        timestamp: LongWord;
         windowID: LongWord;
-        state, repeat_ {*,padding2, padding3*}: Byte;
+        state, repeat_, padding2, padding3: Byte;
 {$ELSE}
         type_, which, state: Byte;
 {$ENDIF}
-        keysym: TSDL_KeySym;
+        keysym: TSDL_Keysym;
         end;
 
     TSDL_MouseMotionEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
         windowID: LongWord;
-        state, padding1, padding2, padding3: Byte;
-        x, y, z, xrel, yrel : LongInt;
+        which, state: LongWord;
+        x, y, xrel, yrel: LongInt;
 {$ELSE}
         type_, which, state: Byte;
-        x, y, xrel, yrel : Word;
+        x, y, xrel, yrel: Word;
 {$ENDIF}
         end;
 
     TSDL_MouseButtonEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
         windowID: LongWord;
+        which: LongWord;
         button, state, padding1, padding2: Byte;
         x, y: LongInt;
 {$ELSE}
@@ -603,9 +665,10 @@
 
     TSDL_MouseWheelEvent = record
         type_: LongWord;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         timestamp: LongWord;
         windowID: LongWord;
+        which: LongWord;
 {$ELSE}
         which: Byte;
 {$ENDIF}
@@ -613,56 +676,58 @@
         end;
 
     TSDL_JoyAxisEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
+        which: LongWord;
 {$ELSE}
         type_: Byte;
+        which: Byte;
 {$ENDIF}
-        which: Byte;
         axis: Byte;
-{$IFDEF SDL13}
-        padding1, padding2: Byte;
+{$IFDEF SDL2}
+        padding1, padding2, padding3: Byte;
         value: LongInt;
+        padding4: Word;
 {$ELSE}
         value: SmallInt;
 {$ENDIF}
         end;
 
     TSDL_JoyBallEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
+        which: LongWord;
 {$ELSE}
         type_: Byte;
+        which: Byte;
 {$ENDIF}
-        which: Byte;
         ball: Byte;
-{$IFDEF SDL13}
-        padding1, padding2: Byte;
-        xrel, yrel: LongInt;
-{$ELSE}
+{$IFDEF SDL2}
+        padding1, padding2, padding3: Byte;
+{$ENDIF}
         xrel, yrel: SmallInt;
-{$ENDIF}
         end;
 
     TSDL_JoyHatEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
+        which: LongWord;
 {$ELSE}
         type_: Byte;
+        which: Byte;
 {$ENDIF}
-        which: Byte;
         hat: Byte;
         value: Byte;
-{$IFDEF SDL13}
-        padding1: Byte;
+{$IFDEF SDL2}
+        padding1, padding2: Byte;
 {$ENDIF}
         end;
 
     TSDL_JoyButtonEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
 {$ELSE}
@@ -671,13 +736,13 @@
         which: Byte;
         button: Byte;
         state: Byte;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         padding1: Byte;
 {$ENDIF}
         end;
 
     TSDL_QuitEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
 {$ELSE}
@@ -686,7 +751,7 @@
         end;
 
     TSDL_UserEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         type_: LongWord;
         timestamp: LongWord;
         windowID: LongWord;
@@ -699,9 +764,10 @@
 
     PSDL_Event = ^TSDL_Event;
     TSDL_Event = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         case LongInt of
-            SDL_FIRSTEVENT: (type_: LongInt);
+            SDL_FIRSTEVENT: (type_: LongWord);
+            SDL_COMMONDEVENT: (common: TSDL_CommonEvent);
             SDL_WINDOWEVENT: (window: TSDL_WindowEvent);
             SDL_KEYDOWN,
             SDL_KEYUP: (key: TSDL_KeyboardEvent);
@@ -716,14 +782,20 @@
             SDL_JOYHATMOTION: (jhat: TSDL_JoyHatEvent);
             SDL_JOYBUTTONDOWN,
             SDL_JOYBUTTONUP: (jbutton: TSDL_JoyButtonEvent);
+            SDL_JOYDEVICEADDED,
+            SDL_JOYDEVICEREMOVED: (jdevice: TSDL_JoyDeviceEvent);
+            SDL_CONTROLLERAXISMOTION: (caxis: TSDL_ControllerAxisEvent);
+            SDL_CONTROLLERBUTTONUP,
+            SDL_CONTROLLERBUTTONDOWN: (cbutton: TSDL_ControllerButtonEvent);
+            SDL_CONTROLLERDEVICEADDED,
+            SDL_CONTROLLERDEVICEREMAPPED,
+            SDL_CONTROLLERDEVICEREMOVED: (cdevice: TSDL_ControllerDeviceEvent);
             SDL_QUITEV: (quit: TSDL_QuitEvent);
             SDL_USEREVENT: (user: TSDL_UserEvent);
             SDL_SYSWMEVENT: (syswm: TSDL_SysWMEvent);
             SDL_FINGERDOWN,
             SDL_FINGERUP,
             SDL_FINGERMOTION: (tfinger: TSDL_TouchFingerEvent);
-            SDL_TOUCHBUTTONUP,
-            SDL_TOUCHBUTTONDOWN: (tbutton: TSDL_TouchButtonEvent);
             SDL_MULTIGESTURE: (mgesture: TSDL_MultiGestureEvent);
             SDL_DOLLARGESTURE: (dgesture: TSDL_DollarGestureEvent);
             SDL_DROPFILE: (drop: TSDL_DropEvent);
@@ -776,16 +848,20 @@
         SDL_GL_MULTISAMPLEBUFFERS,
         SDL_GL_MULTISAMPLESAMPLES,
         SDL_GL_ACCELERATED_VISUAL,
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         SDL_GL_RETAINED_BACKING,
         SDL_GL_CONTEXT_MAJOR_VERSION,
-        SDL_GL_CONTEXT_MINOR_VERSION
+        SDL_GL_CONTEXT_MINOR_VERSION,
+        SDL_GL_CONTEXT_EGL,
+        SDL_GL_CONTEXT_FLAGS,
+        SDL_GL_CONTEXT_PROFILE_MASK,
+        SDL_GL_SHARE_WITH_CURRENT_CONTEXT
 {$ELSE}
         SDL_GL_SWAP_CONTROL
 {$ENDIF}
         );
 
-{$IFDEF SDL13}
+{$IFDEF SDL2}
     TSDL_ArrayByteOrder = (  // array component order, low Byte -> high Byte
         SDL_ARRAYORDER_NONE,
         SDL_ARRAYORDER_RGB,
@@ -797,7 +873,7 @@
         );
 {$ENDIF}
 
-// Joystick/Controller support
+    // Joystick/Controller support
     PSDL_Joystick = ^TSDL_Joystick;
     TSDL_Joystick = record
             end;
@@ -833,7 +909,7 @@
     TMixMusic = record
                 end;
 
-    TPostMix = procedure(udata: pointer; stream: PByte; len: LongInt); cdecl;
+    TPostMix = procedure(udata: Pointer; stream: PByte; len: LongInt); cdecl;
 
     {* SDL_net *}
     TIPAddress = record
@@ -900,7 +976,7 @@
 function  SDL_RWFromFile(filename, mode: PChar): PSDL_RWops; cdecl; external SDLLibName;
 function  SDL_SaveBMP_RW(surface: PSDL_Surface; dst: PSDL_RWops; freedst: LongInt): LongInt; cdecl; external SDLLibName;
 
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 function  SDL_CreateWindow(title: PChar; x,y,w,h: LongInt; flags: LongWord): PSDL_Window; cdecl; external SDLLibName;
 function  SDL_CreateRenderer(window: PSDL_Window; index: LongInt; flags: LongWord): PSDL_Renderer; cdecl; external SDLLibName;
 function  SDL_DestroyWindow(window: PSDL_Window): LongInt; cdecl; external SDLLibName;
@@ -933,8 +1009,15 @@
 procedure SDL_StartTextInput; cdecl; external SDLLibName;
 
 function  SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: TSDL_eventaction; minType, maxType: LongWord): LongInt; cdecl; external SDLLibName;
+
+function  SDL_AllocFormat(format: LongWord): PSDL_PixelFormat; cdecl; external SDLLibName;
+procedure SDL_FreeFormat(pixelformat: PSDL_PixelFormat); cdecl; external SDLLibName;
 {$ELSE}
 function  SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: TSDL_eventaction; mask: LongWord): LongInt; cdecl; external SDLLibName;
+
+function  SDL_EnableUNICODE(enable: LongInt): LongInt; cdecl; external SDLLibName;
+function  SDL_EnableKeyRepeat(timedelay, interval: LongInt): LongInt; cdecl; external SDLLibName;
+function  SDL_VideoDriverName(namebuf: PChar; maxlen: LongInt): PChar; cdecl; external SDLLibName;
 {$ENDIF}
 
 
@@ -950,22 +1033,24 @@
 procedure SDL_SetEventFilter(filter: TSDL_EventFilter); cdecl; external SDLLibName;
 
 function  SDL_ShowCursor(toggle: LongInt): LongInt; cdecl; external SDLLibName;
+procedure SDL_WarpMouse(x, y: Word); {$IFDEF SDL2}inline{$ELSE}cdecl; external SDLLibName{$ENDIF};
+function  SDL_GetKeyState(numkeys: PLongInt): PByteArray; cdecl; external SDLLibName {$IFDEF SDL2} name 'SDL_GetKeyboardState'{$ENDIF};
 
 procedure SDL_WM_SetIcon(icon: PSDL_Surface; mask : Byte); cdecl; external SDLLibName;
 procedure SDL_WM_SetCaption(title: PChar; icon: PChar); cdecl; external SDLLibName;
 function  SDL_WM_ToggleFullScreen(surface: PSDL_Surface): LongInt; cdecl; external SDLLibName;
 
 
-// remember to mark the threaded functions as 'cdecl; export;'
-// (or have fun debugging nil arguments)
-function  SDL_CreateThread(fn: Pointer; {$IFDEF SDL13}name: PChar;{$ENDIF} data: Pointer): PSDL_Thread; cdecl; external SDLLibName;
+(* remember to mark the threaded functions as 'cdecl; export;'
+   (or have fun debugging nil arguments) *)
+function  SDL_CreateThread(fn: Pointer; {$IFDEF SDL2}name: PChar;{$ENDIF} data: Pointer): PSDL_Thread; cdecl; external SDLLibName;
 procedure SDL_WaitThread(thread: PSDL_Thread; status: PLongInt); cdecl; external SDLLibName;
 procedure SDL_KillThread(thread: PSDL_Thread); cdecl; external SDLLibName;
 
 function  SDL_CreateMutex: PSDL_mutex; cdecl; external SDLLibName;
 procedure SDL_DestroyMutex(mutex: PSDL_mutex); cdecl; external SDLLibName;
-function  SDL_LockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName name 'SDL_mutexP';
-function  SDL_UnlockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName name 'SDL_mutexV';
+function  SDL_LockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName {$IFNDEF SDL2}name 'SDL_mutexP'{$ENDIF};
+function  SDL_UnlockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName {$IFNDEF SDL2}name 'SDL_mutexV'{$ENDIF};
 
 function  SDL_GL_SetAttribute(attr: TSDL_GLattr; value: LongInt): LongInt; cdecl; external SDLLibName;
 procedure SDL_GL_SwapBuffers; cdecl; external SDLLibName;
@@ -996,15 +1081,6 @@
 {$ENDIF}
 
 
-{* Compatibility between SDL-1.2 and SDL-1.3 *}
-procedure SDL_WarpMouse(x, y: Word); {$IFDEF SDL13}inline{$ELSE}cdecl; external SDLLibName{$ENDIF};
-function  SDL_GetKeyState(numkeys: PLongInt): PByteArray; cdecl; external SDLLibName {$IFDEF SDL13} name 'SDL_GetKeyboardState'{$ENDIF};
-function  SDL_AllocFormat(format: LongWord): PSDL_PixelFormat; {$IFDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
-procedure SDL_FreeFormat(pixelformat: PSDL_PixelFormat); {$IFDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
-function  SDL_VideoDriverName(namebuf: PChar; maxlen: LongInt): PChar; {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
-function  SDL_EnableUNICODE(enable: LongInt): LongInt; {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
-function  SDL_EnableKeyRepeat(timedelay, interval: LongInt): LongInt; {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
-
 (*  SDL_ttf  *)
 function  TTF_Init: LongInt; cdecl; external SDL_TTFLibName;
 procedure TTF_Quit; cdecl; external SDL_TTFLibName;
@@ -1019,8 +1095,8 @@
 procedure TTF_SetFontStyle(font: PTTF_Font; style: LongInt); cdecl; external SDL_TTFLibName;
 
 (*  SDL_mixer  *)
-function  Mix_Init(flags: LongInt): LongInt; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName;{$ENDIF}
-procedure Mix_Quit; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName;{$ENDIF}
+function  Mix_Init(flags: LongInt): LongInt; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName{$ELSE}inline{$ENDIF};
+procedure Mix_Quit; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName{$ELSE}inline{$ENDIF};
 
 function  Mix_OpenAudio(frequency: LongInt; format: Word; channels: LongInt; chunksize: LongInt): LongInt; cdecl; external SDL_MixerLibName;
 procedure Mix_CloseAudio; cdecl; external SDL_MixerLibName;
@@ -1052,11 +1128,11 @@
 function  Mix_FadeInChannelTimed(channel: LongInt; chunk: PMixChunk; loops: LongInt; fadems: LongInt; ticks: LongInt): LongInt; cdecl; external SDL_MixerLibName;
 function  Mix_FadeOutChannel(channel: LongInt; fadems: LongInt): LongInt; cdecl; external SDL_MixerLibName;
 
-procedure Mix_SetPostMix( mix_func: TPostMix; arg: pointer); cdecl; external SDL_MixerLibName;
+procedure Mix_SetPostMix( mix_func: TPostMix; arg: Pointer); cdecl; external SDL_MixerLibName;
 
 (*  SDL_image  *)
-function  IMG_Init(flags: LongInt): LongInt; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName;{$ENDIF}
-procedure IMG_Quit; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName;{$ENDIF}
+function  IMG_Init(flags: LongInt): LongInt; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName{$ELSE}inline{$ENDIF};
+procedure IMG_Quit; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName{$ELSE}inline{$ENDIF};
 
 function  IMG_Load(const _file: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
 function  IMG_Load_RW(rwop: PSDL_RWops; freesrc: LongBool): PSDL_Surface; cdecl; external SDL_ImageLibName;
@@ -1085,64 +1161,23 @@
 function  SDLNet_Read32(buf: Pointer): LongWord;
 
 implementation
-{$IFDEF SDL13}
-uses strings, uVariables, uStore;
+{$IFDEF SDL2}
+uses uStore;
 
-// compatible functions
+// for sdl1.2 we directly call SDL_WarpMouse()
+// for sdl2 we provide a SDL_WarpMouse() which calls the right SDL_WarpMouseInWindow() function
+// this has the advantage of reducing 'uses' and 'ifdef' statements
+// (SDLwindow is a private member of uStore module)
 procedure SDL_WarpMouse(x, y: Word); inline;
 begin
     WarpMouse(x, y);
 end;
-
-function SDL_VideoDriverName(namebuf: PChar; maxlen: LongInt): PChar;
-var name : PChar = nil;
-begin
-    name:= SDL_GetCurrentVideoDriver();
-    if (name <> nil) and (namebuf <> nil) then
-        begin
-        strlcopy(namebuf, name, maxlen);
-        SDL_VideoDriverName:= namebuf
-        end;
-    SDL_VideoDriverName:= name;
-end;
-
-function SDL_EnableUNICODE(enable: LongInt): LongInt;
-begin
-    enable:= enable; // avoid hint
-    SDL_StartTextInput();
-    SDL_EnableUNICODE:= 0;
-end;
-
-function SDL_EnableKeyRepeat(timedelay, interval: LongInt): LongInt;
-begin
-    timedelay:= timedelay;  // avoid hint
-    interval:= interval;    // avoid hint
-    SDL_EnableKeyRepeat:= 0;
-end;
-{$ELSE}
-const conversionFormat: TSDL_PixelFormat = (
-        palette: nil; BitsPerPixel: 32; BytesPerPixel: 4;
-        Rloss: 0; Gloss: 0; Bloss: 0; Aloss: 0;
-        Rshift: RShift; Gshift: GShift; Bshift: BShift; Ashift: AShift;
-        RMask: RMask; GMask: GMask; BMask: BMask; AMask: AMask;
-        colorkey: 0; alpha: 255);
-
-function SDL_AllocFormat(format: LongWord): PSDL_PixelFormat;
-begin
-    format:= format;
-    SDL_AllocFormat:= @conversionFormat;
-end;
-
-procedure SDL_FreeFormat(pixelformat: PSDL_PixelFormat);
-begin
-    pixelformat:= pixelformat;  // avoid hint
-end;
 {$ENDIF}
 
 function SDL_MustLock(Surface: PSDL_Surface): Boolean;
 begin
     SDL_MustLock:=
-{$IFDEF SDL13}
+{$IFDEF SDL2}
         ((surface^.flags and SDL_RLEACCEL) <> 0)
 {$ELSE}
         ( surface^.offset <> 0 ) or (( surface^.flags and (SDL_HWSURFACE or SDL_ASYNCBLIT or SDL_RLEACCEL)) <> 0)
@@ -1150,23 +1185,23 @@
 end;
 
 {$IFNDEF SDL_MIXER_NEWER}
-function  Mix_Init(flags: LongInt): LongInt;
+function  Mix_Init(flags: LongInt): LongInt; inline;
 begin
     Mix_Init:= flags;
 end;
 
-procedure Mix_Quit;
+procedure Mix_Quit; inline;
 begin
 end;
 {$ENDIF}
 
 {$IFNDEF SDL_IMAGE_NEWER}
-function  IMG_Init(flags: LongInt): LongInt;
+function  IMG_Init(flags: LongInt): LongInt; inline;
 begin
     IMG_Init:= flags;
 end;
 
-procedure IMG_Quit;
+procedure IMG_Quit; inline;
 begin
 end;
 {$ENDIF}

--- a/hedgewars/hwLibrary.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/hwLibrary.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -41,6 +41,11 @@
     versionStr^:= cVersionString;
 end;
 
+function HW_versionString: PChar; cdecl; export;
+begin
+    exit(cVersionString + '-r' + cRevisionString + ' (' + cHashString + ')');
+end;
+
 // equivalent to esc+y; when closeFrontend = true the game exits after memory cleanup
 procedure HW_terminate(closeFrontend: boolean); cdecl; export;
 begin
@@ -118,6 +123,7 @@
     GenLandPreview,
     LoadLocaleWrapper,
     HW_versionInfo,
+    HW_versionString,
     HW_terminate,
     HW_getNumberOfWeapons,
     HW_getMaxNumberOfHogs,

--- a/hedgewars/hwengine.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/hwengine.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -136,7 +136,7 @@
 var event: TSDL_Event;
     PrevTime, CurrTime: Longword;
     isTerminated: boolean;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
     previousGameState: TGameState;
 {$ELSE}
     prevFocusState: boolean;
@@ -148,17 +148,17 @@
     begin
         SDL_PumpEvents();
 
-        while SDL_PeepEvents(@event, 1, SDL_GETEVENT, {$IFDEF SDL13}SDL_FIRSTEVENT, SDL_LASTEVENT{$ELSE}SDL_ALLEVENTS{$ENDIF}) > 0 do
+        while SDL_PeepEvents(@event, 1, SDL_GETEVENT, {$IFDEF SDL2}SDL_FIRSTEVENT, SDL_LASTEVENT{$ELSE}SDL_ALLEVENTS{$ENDIF}) > 0 do
         begin
             case event.type_ of
-{$IFDEF SDL13}
+{$IFDEF SDL2}
                 SDL_KEYDOWN:
                     if GameState = gsChat then
                         begin
                     // sdl on iphone supports only ashii keyboards and the unicode field is deprecated in sdl 1.3
                         KeyPressChat(SDL_GetKeyFromScancode(event.key.keysym.sym), event.key.keysym.sym); //TODO correct for keymodifiers
                         end
-                    else 
+                    else
                         if GameState >= gsGame then ProcessKey(event.key);
                 SDL_KEYUP:
                     if (GameState <> gsChat) and (GameState >= gsGame) then
@@ -191,7 +191,7 @@
                     end;
 
                 SDL_FINGERMOTION:
-                    onTouchMotion(event.tfinger.x, event.tfinger.y,event.tfinger.dx, event.tfinger.dy, event.tfinger.fingerId);
+                    onTouchMotion(event.tfinger.x, event.tfinger.y, event.tfinger.dx, event.tfinger.dy, event.tfinger.fingerId);
 
                 SDL_FINGERDOWN:
                     onTouchDown(event.tfinger.x, event.tfinger.y, event.tfinger.fingerId);
@@ -337,7 +337,11 @@
     if not cOnlyStats then SDLTry(SDL_Init(SDL_INIT_VIDEO or SDL_INIT_NOPARACHUTE) >= 0, true);
     WriteLnToConsole(msgOK);
 
+{$IFDEF SDL2}
+    SDL_StartTextInput();
+{$ELSE}
     SDL_EnableUNICODE(1);
+{$ENDIF}
     SDL_ShowCursor(0);
 
     WriteToConsole('Init SDL_ttf... ');

--- a/hedgewars/options.inc	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/options.inc	Sat Jul 27 17:23:26 2013 +0300
@@ -61,7 +61,7 @@
 {$ENDIF}
 
 {$IFDEF USE_TOUCH_INTERFACE}
-    {$DEFINE SDL13}
+    {$DEFINE SDL2}
 {$ENDIF}
 
 

--- a/hedgewars/uAI.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/uAI.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -482,7 +482,7 @@
 FillBonuses(((Me^.State and gstAttacked) <> 0) and (not isInMultiShoot));
 
 SDL_LockMutex(ThreadLock);
-ThinkThread:= SDL_CreateThread(@Think{$IFDEF SDL13}, 'think'{$ENDIF}, Me);
+ThinkThread:= SDL_CreateThread(@Think{$IFDEF SDL2}, 'think'{$ENDIF}, Me);
 SDL_UnlockMutex(ThreadLock);
 end;
 

--- a/hedgewars/uChat.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/uChat.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -58,13 +58,13 @@
 
 const
     colors: array[#0..#6] of TSDL_Color = (
-            (r:$FF; g:$FF; b:$FF; unused:$FF), // unused, feel free to take it for anything
-            (r:$FF; g:$FF; b:$FF; unused:$FF), // chat message [White]
-            (r:$FF; g:$00; b:$FF; unused:$FF), // action message [Purple]
-            (r:$90; g:$FF; b:$90; unused:$FF), // join/leave message [Lime]
-            (r:$FF; g:$FF; b:$A0; unused:$FF), // team message [Light Yellow]
-            (r:$FF; g:$00; b:$00; unused:$FF), // error messages [Red]
-            (r:$00; g:$FF; b:$FF; unused:$FF)  // input line [Light Blue]
+            (r:$FF; g:$FF; b:$FF; a:$FF), // unused, feel free to take it for anything
+            (r:$FF; g:$FF; b:$FF; a:$FF), // chat message [White]
+            (r:$FF; g:$00; b:$FF; a:$FF), // action message [Purple]
+            (r:$90; g:$FF; b:$90; a:$FF), // join/leave message [Lime]
+            (r:$FF; g:$FF; b:$A0; a:$FF), // team message [Light Yellow]
+            (r:$FF; g:$00; b:$00; a:$FF), // error messages [Red]
+            (r:$00; g:$FF; b:$FF; a:$FF)  // input line [Light Blue]
             );
     ChatCommandz: array [TChatCmd] of record
             ChatCmd: string[31];
@@ -298,7 +298,9 @@
 begin
     FreezeEnterKey;
     history:= 0;
+{$IFNDEF SDL2}
     SDL_EnableKeyRepeat(0,0);
+{$ENDIF}
     GameState:= gsGame;
     ResetKbd;
 end;
@@ -325,7 +327,7 @@
                 SetLine(InputStr, '', true)
             else CleanupInput
             end;
-        SDLK_RETURN:
+        SDLK_RETURN, SDLK_KP_ENTER:
             begin
             if Length(InputStr.s) > 0 then
                 begin
@@ -421,7 +423,9 @@
 begin
     s:= s; // avoid compiler hint
     GameState:= gsChat;
+{$IFNDEF SDL2}
     SDL_EnableKeyRepeat(200,45);
+{$ENDIF}
     if length(s) = 0 then
         SetLine(InputStr, '', true)
     else

--- a/hedgewars/uConsts.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/uConsts.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -47,8 +47,8 @@
     cameraKeyboardSpeed : ShortInt = 10;
 
     // color constants
-    cWhiteColorChannels : TSDL_Color = (r:$FF; g:$FF; b:$FF; unused:$FF);
-    cNearBlackColorChannels : TSDL_Color = (r:$00; g:$00; b:$10; unused:$FF);
+    cWhiteColorChannels : TSDL_Color = (r:$FF; g:$FF; b:$FF; a:$FF);
+    cNearBlackColorChannels : TSDL_Color = (r:$00; g:$00; b:$10; a:$FF);
 
     cWhiteColor           : Longword = $FFFFFFFF;
     cYellowColor          : Longword = $FFFFFF00;

--- a/hedgewars/uGame.pas	Fri Jul 19 04:51:08 2013 +0300
+++ b/hedgewars/uGame.pas	Sat Jul 27 17:23:26 2013 +0300
@@ -27,8 +27,8 @@
     implementation
 ////////////////////
 uses uInputHandler, uTeams, uIO, uAI, uGears, uSound, uLocale, uCaptions,
-    uVisualGears, uTypes, uVariables, uCommands, uConsts, uVisualGearsList
-    {$IFDEF USE_TOUCH_INTERFACE}, uTouch{$ENDIF};
+     uTypes, uVariables, uCommands, uConsts, uVisualGearsList
+     {$IFDEF USE_TOUCH_INTERFACE}, uTouch{$ENDIF};
 
 procedure DoGameTick(Lag: LongInt);
 var i,j : LongInt;
@@ -51,7 +51,7 @@
     else if (GameType = gmtSave) or (fastUntilLag and (GameType = gmtNet)) then
         Lag:= 2500;
 
-    if (GameType = gmtDemo) then 
+    if (GameType = gmtDemo) then
         if isSpeed then
             begin
             i:= RealTicks-SpeedStart;
@@ -90,7 +90,7 @@
         if CurrentHedgehog^.BotLevel <> 0 then
             ProcessBot;
         ProcessGears;
-        {$IFDEF SDL13}ProcessTouch;{$ENDIF}
+        {$IFDEF SDL2}ProcessTouch;{$ENDIF}
         end
     else
         begin