remove __S3E__

examples/HelloWorld/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

oxygine/src/oxygine/Clock.cpp

@@ -1,9 +1,8 @@
 #include "Clock.h"
 #include <sstream>
 
-#ifdef __S3E__
-#   include "s3eTimer.h"
-#elif _WIN32
+
+#ifdef _WIN32
 #   include <windows.h>
 #elif __ANDROID__
 #   include "core/android/jniUtils.h"
@@ -157,9 +156,7 @@ namespace oxygine
 
     timeMS getTimeMS()
     {
-#if __S3E__
-        return (timeMS)s3eTimerGetUST();
-#elif EMSCRIPTEN
+#ifdef EMSCRIPTEN
         return SDL_GetTicks();
 #elif OXYGINE_SDL
         return SDL_GetTicks();
@@ -171,9 +168,7 @@ namespace oxygine
 
     int64   getTimeUTCMS()
     {
-#if __S3E__
-        return s3eTimerGetUTC();
-#elif _WIN32
+#ifdef _WIN32
         FILETIME tm;
         GetSystemTimeAsFileTime(&tm);
         int64 t = tm.dwLowDateTime + (int64(tm.dwHighDateTime) << 32);

oxygine/src/oxygine/Font.h

@@ -2,12 +2,7 @@
 #include "oxygine-include.h"
 #include "core/Object.h"
 #include "math/Rect.h"
-
-#ifdef __S3E__
-#include <set>
-#else
 #include <unordered_set>
-#endif
 
 namespace oxygine
 {
@@ -30,9 +25,6 @@ namespace oxygine
         spNativeTexture texture;
 
         bool operator == (const glyph& r) const {return ch == r.ch && opt == r.opt;}
-#ifdef __S3E__
-        bool operator < (const glyph& r) const { return ch < r.ch; }
-#endif
     };
 
     struct GlyphHasher
@@ -68,11 +60,8 @@ namespace oxygine
 
         virtual bool loadGlyph(int code, glyph&, const glyphOptions& opt) { return false; }
 
-#ifdef __S3E__
-        typedef std::set<glyph> glyphs;
-#else
         typedef std::unordered_set<glyph, GlyphHasher> glyphs;
-#endif
+
         glyphs _glyphs;
         bool _ignoreOptions;
 

oxygine/src/oxygine/Input.cpp

@@ -112,7 +112,6 @@ namespace oxygine
         return &_pointers[index];
     }
 
-#ifndef __S3E__
     int Input::touchID2index(int64 id)
     {
         // We can't be sure that SDL's fingerId is not 0,
@@ -148,5 +147,4 @@ namespace oxygine
             return 0;
         return getTouchByIndex(i);
     }
-#endif
 }

oxygine/src/oxygine/Input.h

@@ -23,10 +23,8 @@ namespace oxygine
         /**index should be in range [1, MAX_TOUCHES]*/
         PointerState* getTouchByIndex(pointer_index index);
 
-#ifndef __S3E__
         int touchID2index(int64 id);
         PointerState* getTouchByID(int64 id);
-#endif
 
 
         //internal:

oxygine/src/oxygine/InputText.cpp

@@ -4,11 +4,8 @@
 #include "core/oxygine.h"
 #include "res/ResFont.h"
 #include "utils/stringUtils.h"
-
-#ifndef __S3E__
 #include "SDL_keyboard.h"
 #include "SDL_events.h"
-#endif
 
 namespace oxygine
 {
@@ -110,9 +107,7 @@ namespace oxygine
 
     void InputText::_onSysEvent(Event* event)
     {
-#ifndef __S3E__
         _onSDLEvent((SDL_Event*)event->userData);
-#endif
     }
 
     void InputText::updateText()
@@ -163,7 +158,6 @@ namespace oxygine
         return (int)(prev - begin);
     }
 
-#ifndef __S3E__
     int InputText::_onSDLEvent(SDL_Event* event)
     {
         switch (event->type)
@@ -237,5 +231,4 @@ namespace oxygine
         }
         return 0;
     }
-#endif
 }

oxygine/src/oxygine/InputText.h

@@ -3,10 +3,7 @@
 #include "Event.h"
 #include "EventDispatcher.h"
 #include <string>
-
-#ifndef __S3E__
 #include "SDL.h"
-#endif
 
 namespace oxygine
 {
@@ -48,9 +45,6 @@ namespace oxygine
         static InputText* _active;
 
         void _onSysEvent(Event* event);
-
-#ifndef __S3E__
         int _onSDLEvent(SDL_Event* event);
-#endif
     };
 }

oxygine/src/oxygine/ThreadLoader.cpp

@@ -27,12 +27,11 @@ namespace oxygine
     {
         _ress.push_back(res);
     }
-#ifndef __S3E__
-    void ThreadLoader::add(std::function< void() > v)
+    
+    void ThreadLoader::add(const std::function< void() > &v)
     {
         _funcs.push_back(v);
     }
-#endif
 
     bool ThreadLoader::isCompleted()
     {
@@ -90,13 +89,10 @@ namespace oxygine
             res->load();
         }
 
-#ifndef __S3E__
         for (funcs::iterator i = _funcs.begin(); i != _funcs.end(); ++i)
         {
             (*i)();
         }
-#endif
-
     }
 
     void ThreadLoader::_threadFunc()

oxygine/src/oxygine/ThreadLoader.h

@@ -24,10 +24,7 @@ namespace oxygine
 
         virtual void add(Resources* res);
         virtual void add(Resource* res);
-
-#ifndef __S3E__
-        virtual void add(std::function< void() >);
-#endif
+        virtual void add(const std::function< void() > &f);
 
         void start();
         //void stop();
@@ -52,10 +49,7 @@ namespace oxygine
 
         typedef std::list<Resource*> ress;
         ress _ress;
-
-#ifndef __S3E__
         typedef std::list<std::function<void()> > funcs;
         funcs _funcs;
-#endif
     };
 }

oxygine/src/oxygine/actor/DebugActor.cpp

@@ -26,22 +26,11 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "SDL_scancode.h"
-
-#ifdef __S3E__
-#include "../s3eMemory.h"
-#elif __APPLE__
-#include "../core/ios/ios.h"
-#endif
-
-#ifndef __S3E__
 #include "SDL_video.h"
-#endif
 
-#ifdef __ANDROID__
-#include <malloc.h>
-#endif
-
-#ifdef _WIN32
+#ifdef __APPLE__
+#include "../core/ios/ios.h"
+#elif _WIN32
 #pragma comment(lib, "psapi.lib") // Added to support GetProcessMemoryInfo()
 #include <windows.h>
 #include <Psapi.h>

oxygine/src/oxygine/closure/closure.h

@@ -18,7 +18,7 @@ Many thanks to Wolfhound
 #  pragma once
 #endif
 
-#if !defined(__S3E__) && !defined(OXYGINE_EDITOR)
+#if !defined(OXYGINE_EDITOR)
 #define CLOSURE_FUNCTION 1
 #endif
 

oxygine/src/oxygine/core/STDFileSystem.cpp

@@ -15,24 +15,7 @@
 //#define LOGD(...) oxygine::log::messageln(__VA_ARGS__)
 #define LOGD(...) ((void)0)
 
-#if __S3E__
-#define USE_S3E_FILE
-#include "IwAutoFile.h"
-#include "s3eFile.h"
-
-typedef s3eFile oxHandle;
-
-#define oxFileOpen_ s3eFileOpen
-#define oxFileClose_ s3eFileClose
-#define oxFileSeek s3eFileSeek
-#define oxFileTell s3eFileTell
-#define oxFileWrite s3eFileWrite
-#define ox_FILESEEK_END S3E_FILESEEK_END
-#define ox_FILESEEK_SET S3E_FILESEEK_SET
-
-#define oxFileRead s3eFileRead
-#define oxExists(name) s3eFileCheckExists(name)
-
+#if 0
 #elif OXYGINE_SDL && !OXYGINE_FILESYSTEM_USE_STDIO
 #ifdef _WIN32
 #include <direct.h>
@@ -76,7 +59,7 @@ typedef FILE oxHandle;
 #define ox_FILESEEK_SET SEEK_SET
 #define oxFileRead(ptr, size, n, handle) fread(ptr, size, n, handle)
 
-#endif//__S3E__
+#endif
 
 
 //#define LOGD(...) {}
@@ -148,11 +131,7 @@ namespace oxygine
 
             int seek(unsigned int offset, int whence)
             {
-#ifdef __S3E__
-                return oxFileSeek(_handle, offset, (s3eFileSeekOrigin)whence);
-#else
                 return (int)oxFileSeek(_handle, offset, whence);
-#endif
             }
 
             unsigned int tell() const
@@ -337,9 +316,7 @@ namespace oxygine
             char buff[512];
             _getFullPath(file, buff);
 
-#if __S3E__
-            return (s3eFileDelete(buff) == S3E_RESULT_SUCCESS ? status_ok : status_error);
-#elif OXYGINE_EDITOR
+#ifdef OXYGINE_EDITOR
             return status_error;
 #elif _WIN32
             std::wstring wsPath = utf8tows(buff);
@@ -356,9 +333,7 @@ namespace oxygine
             char buff[512];
             _getFullPath(path, buff);
 
-#if __S3E__
-            return (s3eFileMakeDirectory(buff) == S3E_RESULT_SUCCESS ? status_ok : status_error);
-#elif _WIN32
+#ifdef _WIN32
             return (_mkdir(buff) != -1 ? status_ok : status_error);
 #else
             return (mkdir(buff, 0777) != -1 ? status_ok : status_error);
@@ -382,9 +357,7 @@ namespace oxygine
             char buffDest[512];
             _getFullPath(dest, buffDest);
 
-#if __S3E__
-            return (s3eFileRename(buffSrc, buffDest) == S3E_RESULT_SUCCESS ? status_ok : status_error);
-#elif OXYGINE_EDITOR
+#ifdef OXYGINE_EDITOR
             return status_error;
 #elif _WIN32
             std::wstring s = utf8tows(buffSrc);
@@ -400,16 +373,12 @@ namespace oxygine
         {
             char buff[512];
             _getFullPath(file, buff);
-#if __S3E__
-            s3eBool res = s3eFileCheckExists(buff);
-            return res == S3E_TRUE;
-#else
+
             //todo optimize
             oxHandle* h = oxFileOpen(buff, "rb");
             if (h)
                 oxFileClose(h);
             return h != 0;
-#endif
         }
     }
 }

oxygine/src/oxygine/core/ZipFileSystem.cpp

@@ -2,15 +2,10 @@
 #include "../core/Object.h"
 #include "../minizip/ioapi_mem.h"
 #include "../utils/stringUtils.h"
-//#include "../utils/utils.h"
 #include <algorithm>
 #include <map>
 #include <string.h>
 
-#ifdef __S3E__
-#include "s3eFile.h"
-#endif
-
 namespace oxygine
 {
     namespace file

oxygine/src/oxygine/core/file.cpp

@@ -5,9 +5,7 @@
 #include "../utils/stringUtils.h"
 #include <string>
 
-#ifdef __S3E__
-#include <s3eFile.h>
-#elif _WIN32
+#ifdef _WIN32
 #include <direct.h>
 #elif __APPLE__
 #include "ios/ios.h"
@@ -47,10 +45,7 @@ namespace oxygine
                 return;
             _fsInitialized = true;
 
-#ifdef __S3E__
-            _nfs.setPath("rom://");
-            _nfsWrite.setPath("ram://");
-#elif EMSCRIPTEN
+#ifdef EMSCRIPTEN
             //mkdir("data-ram/", S_IRWXU|S_IRWXG|S_IRWXO);
             //_nfsWrite.setPath("data-ram/");
 

oxygine/src/oxygine/core/gl/ShaderProgramGL.cpp

@@ -1,10 +1,7 @@
 #include "ShaderProgramGL.h"
 #include "VertexDeclarationGL.h"
 #include "oxgl.h"
-
-#ifndef __S3E__
 #include "SDL.h"
-#endif
 
 namespace oxygine
 {
@@ -90,14 +87,11 @@ namespace oxygine
 
         bool gles = false;
 
-#ifdef __S3E__
-        gles = true;
-#elif OXYGINE_SDL
+
+#ifdef OXYGINE_SDL
         int profile = 0;
         SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile);
-
         gles = profile == SDL_GL_CONTEXT_PROFILE_ES;
-#else
 #endif
 
 

oxygine/src/oxygine/core/gl/oxgl.h

@@ -1,14 +1,6 @@
 #pragma once
 #include "../../oxygine-include.h"
 
-#if __S3E__
-#   include "IwImage.h"
-#   include "IwGL.h"
-#   include "GLES/gl.h"
-#   define GL_GLEXT_PROTOTYPES
-#   include "GLES/glext.h"
-#   include <gles/egl.h>
-#else
 #   include "SDL_config.h"
 
 #if _WIN32
@@ -115,7 +107,6 @@ extern "C"
 
 #   define GL_ETC1_RGB8_OES                                        0x8D64
 #endif
-#endif
 
 
 

oxygine/src/oxygine/core/log.cpp

@@ -26,14 +26,11 @@ namespace oxygine
     FILE* fh = 0;
 
 
-#ifdef __S3E__
-    const int SIZE = 512;
-#else
+
 #ifdef OX_DEBUG
     const int SIZE = 16384;
 #else
     const int SIZE = 4096;
-#endif
 #endif
 
     namespace log

oxygine/src/oxygine/core/oxygine.cpp

@@ -24,17 +24,6 @@
 #include "gl/oxgl.h"
 #include <stdio.h>
 
-#ifdef __S3E__
-#include "s3e.h"
-#include "IwGL.h"
-#include "s3eSurface.h"
-#include "s3eDebug.h"
-#include "s3eTimer.h"
-#include "s3ePointer.h"
-#include "s3eOSExec.h"
-#endif
-
-
 #include "gl/VideoDriverGLES20.h"
 #include "../STDRenderDelegate.h"
 
@@ -258,42 +247,8 @@ namespace oxygine
             focus = true;
             active = true;
 
-#ifdef __S3E__
-            log::messageln("S3E build");
-            if (!IwGLInit())
-            {
-                s3eDebugErrorShow(S3E_MESSAGE_CONTINUE, "IwGLInit failed");
-                return;
-            }
-            //init_ext();
-
-            int width = IwGLGetInt(IW_GL_WIDTH);
-            int height = IwGLGetInt(IW_GL_HEIGHT);
 
-            log::messageln("Screen BPP  : %d", s3eSurfaceGetInt(S3E_SURFACE_PIXEL_TYPE) & S3E_SURFACE_PIXEL_SIZE_MASK);
-            log::messageln("Screen Size : %dx%d", width, height);
-            log::messageln("Vendor      : %s", (const char*)glGetString(GL_VENDOR));
-            log::messageln("Renderer    : %s", (const char*)glGetString(GL_RENDERER));
-
-            const char* version = (const char*)glGetString(GL_VERSION);
-            log::messageln("Version    : %s", version);
-
-            s3ePointerUpdate();
-            if (s3ePointerGetInt(S3E_POINTER_MULTI_TOUCH_AVAILABLE))
-            {
-                s3ePointerRegister(S3E_POINTER_TOUCH_EVENT, &pointerTouchEvent, 0);
-                s3ePointerRegister(S3E_POINTER_TOUCH_MOTION_EVENT, &pointerTouchMotionEvent, 0);
-            }
-            else
-            {
-                s3ePointerRegister(S3E_POINTER_BUTTON_EVENT, &pointerEvent, 0);
-                s3ePointerRegister(S3E_POINTER_MOTION_EVENT, &pointerMotionEvent, 0);
-            }
-
-            s3eDeviceRegister(S3E_DEVICE_UNPAUSE, applicationUnPause, 0);
-            s3eDeviceRegister(S3E_DEVICE_PAUSE, applicationPause, 0);
-
-#elif OXYGINE_SDL
+#ifdef OXYGINE_SDL
 
             log::messageln("SDL build");
 
@@ -443,14 +398,6 @@ namespace oxygine
             Point size = getDisplaySize();
             log::messageln("display size: %d %d", size.x, size.y);
 
-
-#if __S3E__
-            int glversion = s3eGLGetInt(S3E_GL_VERSION);
-            int major_gl = glversion >> 8;
-            OX_ASSERT(major_gl == 2 && "gl version should be 2");
-            IVideoDriver::instance = new VideoDriverGLES20();
-#endif
-
             IVideoDriver::instance = new VideoDriverGLES20();
 
 
@@ -600,9 +547,8 @@ namespace oxygine
 #endif
 
             CHECKGL();
-#if __S3E__
-            IwGLSwapBuffers();
-#elif OXYGINE_SDL
+
+#ifdef OXYGINE_SDL
             SDL_Window* wnd = w;
             if (!wnd)
                 wnd = _window;
@@ -622,8 +568,7 @@ namespace oxygine
             //sleep(1000/50);
         }
 
-#ifdef __S3E__
-#elif OXYGINE_EDITOR
+#ifdef OXYGINE_EDITOR
 #else
         spStage getStageByWindow(Uint32 windowID)
         {
@@ -783,7 +728,6 @@ namespace oxygine
 #ifndef OXYGINE_EDITOR
             key::update();
 #endif
-
             timeMS duration = IVideoDriver::_stats.duration;
             IVideoDriver::_stats = IVideoDriver::Stats();
             IVideoDriver::_stats.duration = duration;
@@ -791,24 +735,6 @@ namespace oxygine
             ThreadDispatcher::peekMessage msg;
             while (_threadMessages.peek(msg, true)) {}
 
-#ifdef __S3E__
-
-            s3eDeviceYield(0);
-            s3eKeyboardUpdate();
-            s3ePointerUpdate();
-
-            bool done = false;
-
-            if (s3eDeviceCheckQuitRequest())
-                done = true;
-
-            if (s3eKeyboardGetState(s3eKeyEsc) & S3E_KEY_STATE_PRESSED)
-                done = true;
-
-            return done;
-#endif
-
-
 #if OXYGINE_SDL
 
             //log::messageln("update");
@@ -887,10 +813,7 @@ namespace oxygine
 
         void execute(const char* str)
         {
-#ifdef __S3E__
-
-            s3eOSExecExecute(str, false);
-#elif OXYGINE_EDITOR
+#ifdef OXYGINE_EDITOR
 #elif __ANDROID__
             jniBrowse(str);
 #elif EMSCRIPTEN
@@ -918,9 +841,7 @@ namespace oxygine
         void requestQuit()
         {
             log::messageln("requestQuit");
-#ifdef __S3E__
-            s3eDeviceRequestQuit();
-#elif OXYGINE_SDL
+#ifdef OXYGINE_SDL
             SDL_Event ev;
             ev.type = SDL_QUIT;
             SDL_PushEvent(&ev);
@@ -940,24 +861,7 @@ namespace oxygine
 
         Point getDisplaySize()
         {
-#if __S3E__
-            int width = IwGLGetInt(IW_GL_WIDTH);
-            int height = IwGLGetInt(IW_GL_HEIGHT);
-
-            int orient = s3eSurfaceGetInt(S3E_SURFACE_DEVICE_ORIENTATION_LOCK);
-            if (height > width)
-            {
-                if (orient == S3E_SURFACE_LANDSCAPE || orient == S3E_SURFACE_LANDSCAPE_FIXED)
-                    std::swap(width, height);
-            }
-            else
-            {
-                if (orient == S3E_SURFACE_PORTRAIT || orient == S3E_SURFACE_PORTRAIT_FIXED)
-                    std::swap(width, height);
-            }
-
-            return Point(width, height);
-#elif OXYGINE_EDITOR
+#ifdef OXYGINE_EDITOR
             return _qtFixedSize;
 #elif OXYGINE_SDL
             int w = 0;
@@ -997,9 +901,7 @@ namespace oxygine
 
     bool    isNetworkAvailable()
     {
-#if __S3E__
-        return s3eSocketGetInt(S3E_SOCKET_NETWORK_AVAILABLE) == 1;
-#elif __ANDROID__
+#ifdef __ANDROID__
         return jniIsNetworkAvailable();
 #endif
         return true;
@@ -1028,9 +930,7 @@ namespace oxygine
 
     void    sleep(timeMS time)
     {
-#if __S3E__
-        s3eDeviceYield(time);
-#elif OXYGINE_SDL
+#ifdef OXYGINE_SDL
         SDL_Delay(time);
 #else
         log::warning("sleep not implemented");

oxygine/src/oxygine/key.cpp

@@ -1,10 +1,5 @@
 #include "key.h"
-
-#ifdef __S3E__
-#   include "s3eKeyboard.h"
-#else
-#   include "SDL_keyboard.h"
-#endif
+#include "SDL_keyboard.h"
 
 #include <algorithm>
 
@@ -33,9 +28,6 @@ namespace oxygine
 
         void update()
         {
-#ifdef __S3E__
-#else
-
             if (!_counter)
                 return;
 
@@ -43,43 +35,27 @@ namespace oxygine
             const Uint8* data = SDL_GetKeyboardState(&num);
             num = std::min(num, KEYS);
             memcpy(_keys, data, num);
-#endif
         }
 
 
         bool wasPressed(keycode key)
         {
-
-#ifdef __S3E__
-            return s3eKeyboardGetState((s3eKey)key) & S3E_KEY_STATE_PRESSED;
-#else
             OX_ASSERT(_counter);
             const Uint8* data = SDL_GetKeyboardState(0);
             return data[key] && !_keys[key];
-#endif
         }
 
         bool wasReleased(keycode key)
         {
-
-#ifdef __S3E__
-            return s3eKeyboardGetState((s3eKey)key) & S3E_KEY_STATE_RELEASED;
-#else
             OX_ASSERT(_counter);
             const Uint8* data = SDL_GetKeyboardState(0);
             return !data[key] && _keys[key];
-#endif
         }
 
         bool isPressed(keycode key)
         {
-
-#ifdef __S3E__
-            return s3eKeyboardGetState((s3eKey)key) & S3E_KEY_STATE_DOWN;
-#else
             const Uint8* data = SDL_GetKeyboardState(0);
             return data[key] != 0;
-#endif
         }
     }
 }

oxygine/src/oxygine/key.h

@@ -1,10 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
+#include "SDL_keyboard.h"
 
-#ifdef __S3E__
-#else
-#   include "SDL_keyboard.h"
-#endif
 namespace oxygine
 {
     namespace key

oxygine/src/oxygine/oxygine-include.h

@@ -38,12 +38,8 @@
 // Bypass SDL file functions and use plain fopen, fread etc.
 //#define OXYGINE_FILESYSTEM_USE_STDIO 1
 
-#if __S3E__
-#   define OXYGINE_MARMALADE 1
-#   ifdef IW_DEBUG
-#       define OX_DEBUG 1
-#   endif
-#elif EMSCRIPTEN
+
+#ifdef EMSCRIPTEN
 #   define OXYGINE_EMSCRIPTEN 1
 #   define OXYGINE_SDL 1
 #   ifndef NDEBUG
@@ -136,7 +132,6 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 #endif
 
 
-#ifndef __S3E__
 #   if defined(_MSC_VER) || defined(__BORLANDC__)
 typedef unsigned __int64 uint64;
 typedef signed __int64 int64;
@@ -144,7 +139,6 @@ typedef signed __int64 int64;
 typedef unsigned long long uint64;
 typedef signed long long int64;
 #   endif
-#endif
 
 #ifdef OXYGINE_QT
 #define INHERITED(CLASS) private: typedef Editor##CLASS inherited
@@ -157,7 +151,7 @@ typedef signed long long int64;
 #endif
 
 
-#if !defined(__S3E__) && ( (defined(_MSC_VER) && (_MSC_VER > 1800)) || (__cplusplus > 199711L))
+#if ( (defined(_MSC_VER) && (_MSC_VER > 1800)) || (__cplusplus > 199711L))
 #define OX_HAS_CPP11
 #endif
 

oxygine/src/oxygine/res/ResAtlas.cpp

@@ -5,10 +5,6 @@
 #include "../Image.h"
 #include "../core/VideoDriver.h"
 
-#ifdef __S3E__
-#include "IwImage.h"
-#endif
-
 //#define  LOGD(...)  log::messageln(__VA_ARGS__)
 #define  LOGD(...)
 

oxygine/src/oxygine/res/Resources.cpp

@@ -286,11 +286,7 @@ namespace oxygine
 
     void Resources::collect(resources& r)
     {
-#ifdef __S3E__
-        for (resourcesMap::const_iterator i = _resourcesMap.begin(); i != _resourcesMap.end(); ++i)
-#else
         for (resourcesMap::const_iterator i = _resourcesMap.cbegin(); i != _resourcesMap.cend(); ++i)
-#endif
         {
             spResource res = i->second;
             r.push_back(res);
@@ -330,12 +326,7 @@ namespace oxygine
     void Resources::print() const
     {
         log::message("resources:\n");
-#ifdef __S3E__
-        for (resourcesMap::const_iterator i = _resourcesMap.begin(); i != _resourcesMap.end(); ++i)
-#else
         for (resourcesMap::const_iterator i = _resourcesMap.cbegin(); i != _resourcesMap.cend(); ++i)
-#endif
-
         {
             spResource res = i->second;
             log::message("%s\n", res->getName().c_str());

oxygine/src/oxygine/res/Resources.h

@@ -7,12 +7,7 @@
 #include <list>
 #include <string.h>
 #include <string>
-
-#ifdef __S3E__
-#include <map>
-#else
 #include <unordered_map>
-#endif
 
 
 namespace oxygine
@@ -46,11 +41,7 @@ namespace oxygine
         INHERITED(Resource);
     public:
         typedef std::vector<spResource> resources;
-#ifdef __S3E__
-        typedef std::map<std::string, spResource> resourcesMap;
-#else
         typedef std::unordered_map<std::string, spResource> resourcesMap;
-#endif
 
         typedef Resource* (*createResourceCallback)(CreateResourceContext& context);
         typedef Closure<void (Resource*)> ResLoadedCallback;

oxygine/src/oxygine/utils/ImageUtils.cpp

@@ -10,11 +10,6 @@ extern "C"
 #endif
 };
 
-
-#ifdef __S3E__
-#include "IwImage.h"
-#endif
-
 namespace oxygine
 {
     void saveImage(const ImageData& im_, const char* path, const char* format)

oxygine/src/oxygine/utils/stringUtils.cpp

@@ -3,10 +3,6 @@
 #include <algorithm>
 #include <string.h>
 
-#ifdef __S3E__
-#include "IwUTF8.h"
-#endif
-
 #ifdef OXYGINE_SDL
 #include "SDL_stdinc.h"
 #endif
@@ -288,21 +284,7 @@ namespace oxygine
             return L"";
 
 
-
-#if __S3E__
-        wchar_t* s = (wchar_t*)fastAlloc(4 * n);
-        s[0] = 0;
-
-        int len = IwUTF8ToWideChar(utf8str, n, s, n * 4);
-        s[len] = 0;
-
-        std::wstring str = s;
-        str.reserve(n);
-        fastFree(s);
-
-        return str;
-
-#elif OXYGINE_SDL
+#ifdef OXYGINE_SDL
         wchar_t* s = 0;
         if (sizeof(wchar_t) == 2)
             s = (wchar_t*)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", utf8str, n);
@@ -341,18 +323,7 @@ namespace oxygine
         if (n == 1)
             return "";
 
-
-#if __S3E__
-        char* s = (char*)fastAlloc(4 * n);
-        s[0] = 0;
-
-        int len = IwWideCharToUTF8(wstr, n, s, n * 4);
-        s[len] = 0;
-
-        std::string str = s;
-        fastFree(s);
-        return str;
-#elif OXYGINE_SDL
+#ifdef OXYGINE_SDL
         char*  s = 0;
         if (sizeof(wchar_t) == 2)
             s = SDL_iconv_string("UTF-8", "UCS-2-INTERNAL", (const char*)wstr, n * sizeof(wchar_t));

oxygine/src/oxygine/utils/stringUtils.h

@@ -59,7 +59,7 @@ namespace oxygine
     {
         va_list args;
         va_start(args, format);
-#if defined(_MSC_VER) && !defined(__S3E__)
+#if defined(_MSC_VER)
         size_t r = vsnprintf_s(str, N, format, args);
 #else
         size_t r = vsnprintf(str, N, format, args);