summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Widen <andreas@harmonicflow.org>2019-08-10 14:36:19 +0200
committerAndreas Widen <andreas@harmonicflow.org>2019-08-10 14:36:19 +0200
commitaebc0cf24a2010fef69b46f7b959dedd7fc6fb18 (patch)
tree0146165e3ca26b0bfe9f4d48550553c4ff73d66c
parent2f72b439a7562570eb93e16d3d7f37b5b3488a7c (diff)
downloadHarmonicFlowFramework-aebc0cf24a2010fef69b46f7b959dedd7fc6fb18.tar.xz
HarmonicFlowFramework-aebc0cf24a2010fef69b46f7b959dedd7fc6fb18.zip
iOS and Android removals and clean-ups.
Signed-off-by: Andreas Widen <andreas@harmonicflow.org>
-rw-r--r--NEWS5
-rwxr-xr-xbuild_scripts/linux-header-copy-sdl-local.sh2
-rw-r--r--configure.ac4
-rw-r--r--src/engine/CMakeLists.txt2
-rw-r--r--src/engine/hffwk_version.h4
-rw-r--r--src/engine/platform/FileDirUtils.h2
-rw-r--r--src/engine/platform/Game.h55
-rw-r--r--src/engine/platform/PakInterface.cpp22
-rw-r--r--src/engine/platform/PakInterface.h2
-rw-r--r--src/engine/platform/sdl/SDLHelper.cpp12
-rw-r--r--src/engine/platform/sdl/SDLOpenGLShader.cpp2
-rw-r--r--src/engine/platform/sdl/SDLSound.cpp2
-rw-r--r--src/engine/platform/sdl/SDLSoundPlayer.cpp2
-rw-r--r--src/engine/platform/windows/WinD3D9Shader.cpp2
14 files changed, 34 insertions, 84 deletions
diff --git a/NEWS b/NEWS
index 1fddcd0..06bb6e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+0.10.2 2019-08-10:
+ - Removed iOS and Android related methods in 'platform/Game.h'
+ interface + some clean-ups related to iOS and Android in
+ misc other files.
+
0.10.1 2019-07-26:
- Updated SDL2 to version 2.0.10.
- Fixed doxygen documentation for main page due to API change.
diff --git a/build_scripts/linux-header-copy-sdl-local.sh b/build_scripts/linux-header-copy-sdl-local.sh
index ba4ff09..6c3f976 100755
--- a/build_scripts/linux-header-copy-sdl-local.sh
+++ b/build_scripts/linux-header-copy-sdl-local.sh
@@ -19,7 +19,7 @@
# misrepresented as being the original software.
# 3. This notice may not be removed or altered from any source distribution.
#
-# Copy SDL header locally for Win32 and iOS:
+# Copy SDL header locally for Win32:
# set all paths we need:
CANONPATH=`readlink -f "$0"`
diff --git a/configure.ac b/configure.ac
index d074d74..f58c1d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
-AC_INIT([HarmonicFlowFramework], [0.10.1], [andreas@harmonicflow.org])
+AC_INIT([HarmonicFlowFramework], [0.10.2], [andreas@harmonicflow.org])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([-Wall subdir-objects])
AC_CONFIG_SRCDIR([src/engine/platform/Environment.h])
@@ -74,7 +74,7 @@ AC_SUBST(WINDRESFLAGS)
#
HFFWK_MAJOR_VERSION=0
HFFWK_MINOR_VERSION=10
-HFFWK_MICRO_VERSION=1
+HFFWK_MICRO_VERSION=2
HFFWK_INTERFACE_AGE=0
HFFWK_BINARY_AGE=0
HFFWK_VERSION=$HFFWK_MAJOR_VERSION.$HFFWK_MINOR_VERSION.$HFFWK_MICRO_VERSION
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index f6b4029..a77fd49 100644
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -48,7 +48,7 @@ project(HFFWK C CXX)
#
set(HFFWK_MAJOR_VERSION 0)
set(HFFWK_MINOR_VERSION 10)
-set(HFFWK_MICRO_VERSION 1)
+set(HFFWK_MICRO_VERSION 2)
set(HFFWK_INTERFACE_AGE 0)
set(HFFWK_BINARY_AGE 0)
set(HFFWK_VERSION "${HFFWK_MAJOR_VERSION}.${HFFWK_MINOR_VERSION}.${HFFWK_MICRO_VERSION}")
diff --git a/src/engine/hffwk_version.h b/src/engine/hffwk_version.h
index c97a488..e1dc72c 100644
--- a/src/engine/hffwk_version.h
+++ b/src/engine/hffwk_version.h
@@ -41,12 +41,12 @@
/**
* @brief Patchlevel version.
*/
-#define HFFWK_PATCHLEVEL 1
+#define HFFWK_PATCHLEVEL 2
/**
* @brief Version string.
*/
-#define HFFWK_VERSION "0.10.1"
+#define HFFWK_VERSION "0.10.2"
/**
* @brief 3rd party library 'stb_image' Major version.
diff --git a/src/engine/platform/FileDirUtils.h b/src/engine/platform/FileDirUtils.h
index 418cc6d..4c590c7 100644
--- a/src/engine/platform/FileDirUtils.h
+++ b/src/engine/platform/FileDirUtils.h
@@ -88,7 +88,7 @@ namespace HFCore
/**
* @brief Builds full file path to file on platforms where
- * relative paths doesn't work such as iOS and Mac.
+ * relative paths doesn't work.
*
* It is the recommended way to keep file fetching working fine
* on all platforms.
diff --git a/src/engine/platform/Game.h b/src/engine/platform/Game.h
index bb10836..3499fcf 100644
--- a/src/engine/platform/Game.h
+++ b/src/engine/platform/Game.h
@@ -274,61 +274,6 @@ namespace HFCore
* @param windowID ID of the Window.
*/
virtual void windowClosed(int32_hf windowID) {}
-
- /**
- * @brief Called when the application is being terminated by the OS.
- * <b>(iOS and Android only)</b>
- *
- * @note Called on iOS in applicationWillTerminate().<br>
- * Called on Android in onDestroy().
- */
- virtual void appTerminating() {}
-
- /**
- * @brief Called when the application is low on memory, free memory
- * if possible.<b>(iOS and Android only)</b>
- *
- * @note Called on iOS in applicationDidReceiveMemoryWarning().<br>
- * Called on Android in onLowMemory().
- */
- virtual void appLowMemory() {}
-
- /**
- * @brief Called when the application is about to enter the background.
- * <b>(iOS and Android only)</b>
- *
- * @note Called on iOS in applicationWillResignActive().<br>
- * Called on Android in onPause().
- */
- virtual void appWillEnterBackground() {}
-
- /**
- * @brief Called when the application did enter the background and
- * may not get CPU for some time.<b>(iOS and Android only)</b>
- *
- * @note Called on iOS in applicationDidEnterBackground().<br>
- * Called on Android in onPause().
- */
- virtual void appDidEnterBackground() {}
-
- /**
- * @brief Called when the application is about to enter the foreground.
- * <b>(iOS and Android only)</b>
- *
- * @note Called on iOS in applicationWillEnterForeground().<br>
- * Called on Android in onResume().
- */
- virtual void appWillEnterForeground() {}
-
- /**
- * @brief Called when the application is interactive.
- * <b>(iOS and Android only)</b>
- *
- * @note Called on iOS in applicationDidBecomeActive().<br>
- * Called on Android in onResume().
- */
- virtual void appDidEnterForeground() {}
-
/**
* @brief Called by the framework when Render textures needs to
* be destroyed.
diff --git a/src/engine/platform/PakInterface.cpp b/src/engine/platform/PakInterface.cpp
index a770be5..6a2f2ed 100644
--- a/src/engine/platform/PakInterface.cpp
+++ b/src/engine/platform/PakInterface.cpp
@@ -23,7 +23,7 @@
// Windows specific
#if defined(HF_PLATFORM_WINDOWS)
#include <direct.h>
-// Mac + Linux + iOS + Android
+// Linux
#elif defined(HF_PAK_USE_MMAP)
#include <unistd.h>
#include <string.h>
@@ -133,7 +133,7 @@ bool PakInterface::addPakFile(const std::string &fileName,
pakCollection->mFileSize = fileSize;
pakCollection->mDecryptPassword = decryptPassword;
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
int32_hf fd;
void *ptr;
@@ -269,7 +269,7 @@ static void fixFileName(const int8_hf *fileName, int8_hf *upperName)
upperName = NULL;
return;
}
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
int8_hf *ptr = getcwd(dir, 256);
if (ptr == NULL)
@@ -288,7 +288,7 @@ static void fixFileName(const int8_hf *fileName, int8_hf *upperName)
#if defined(HF_PLATFORM_WINDOWS)
if (_strnicmp(dir, fileName, len) == 0)
fileName += len;
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
if (strncasecmp(dir, fileName, len) == 0)
fileName += len;
@@ -336,7 +336,7 @@ PFILE *PakInterface::FOpen(const int8_hf *fileName, const int8_hf *access)
if ((_strnicmp(access, "r", strlen(access)) == 0) ||
(_strnicmp(access, "rb", strlen(access)) == 0) ||
(_strnicmp(access, "rt", strlen(access)) == 0))
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
if ((strncasecmp(access, "r", strlen(access)) == 0) ||
(strncasecmp(access, "rb", strlen(access)) == 0) ||
@@ -367,7 +367,7 @@ PFILE *PakInterface::FOpen(const int8_hf *fileName, const int8_hf *access)
#else
errno_t err = fopen_s(&file, fileName, access);
#endif
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
file = fopen(fileName, access);
#else
@@ -391,7 +391,7 @@ PFILE *PakInterface::FOpen(const wchar_t *fileName, const wchar_t *access)
if ((_wcsnicmp(access, L"r", wcslen(access)) == 0) ||
(_wcsnicmp(access, L"rb", wcslen(access)) == 0) ||
(_wcsnicmp(access, L"rt", wcslen(access)) == 0))
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
std::wstring tmp = fileName;
std::wstring tmp2 = access;
@@ -429,7 +429,7 @@ PFILE *PakInterface::FOpen(const wchar_t *fileName, const wchar_t *access)
#else
_wfopen_s(&file, fileName, access);
#endif
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
file = fopen(tmpFileName.c_str(), tmpAccess.c_str());
#else
@@ -589,7 +589,7 @@ HFCore::PakInterfaceBase *getPakPtr()
0, 0, sizeof(HFCore::PakInterface *));
}
return *gPakInterfaceP;
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
return gPakInterface;
#else
@@ -610,7 +610,7 @@ HFCore::PFILE *p_fopen(const int8_hf *fileName, const int8_hf *access)
#else
errno_t err = fopen_s(&file, fileName, access);
#endif
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
file = fopen(fileName, access);
#else
@@ -642,7 +642,7 @@ HFCore::PFILE *p_fopen(const wchar_t *fileName, const wchar_t *access)
#else
_wfopen_s(&file, fileName, access);
#endif
- // Mac + Linux + iOS + Android
+ // Linux
#elif defined(HF_PAK_USE_MMAP)
std::wstring tmp = fileName;
std::wstring tmp2 = access;
diff --git a/src/engine/platform/PakInterface.h b/src/engine/platform/PakInterface.h
index 321598b..bd88dd2 100644
--- a/src/engine/platform/PakInterface.h
+++ b/src/engine/platform/PakInterface.h
@@ -42,7 +42,7 @@
#if defined(HF_PLATFORM_WINDOWS)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-// Mac + Linux + iOS + Android
+// Linux
#elif defined(HF_PAK_USE_MMAP)
#include <stdlib.h>
#include <fcntl.h>
diff --git a/src/engine/platform/sdl/SDLHelper.cpp b/src/engine/platform/sdl/SDLHelper.cpp
index 3afe17c..c1c40cb 100644
--- a/src/engine/platform/sdl/SDLHelper.cpp
+++ b/src/engine/platform/sdl/SDLHelper.cpp
@@ -65,27 +65,27 @@ void SDLHelper::handleSDLEvents(SDL_Event event)
switch (event.type)
{
case SDL_APP_TERMINATING:
- HFCORE_ENV->getGameInstance()->appTerminating();
+ //HFCORE_ENV->getGameInstance()->appTerminating();
break;
case SDL_APP_LOWMEMORY:
- HFCORE_ENV->getGameInstance()->appLowMemory();
+ //HFCORE_ENV->getGameInstance()->appLowMemory();
break;
case SDL_APP_WILLENTERBACKGROUND:
- HFCORE_ENV->getGameInstance()->appWillEnterBackground();
+ //HFCORE_ENV->getGameInstance()->appWillEnterBackground();
break;
case SDL_APP_DIDENTERBACKGROUND:
- HFCORE_ENV->getGameInstance()->appDidEnterBackground();
+ //HFCORE_ENV->getGameInstance()->appDidEnterBackground();
break;
case SDL_APP_WILLENTERFOREGROUND:
- HFCORE_ENV->getGameInstance()->appWillEnterForeground();
+ //HFCORE_ENV->getGameInstance()->appWillEnterForeground();
break;
case SDL_APP_DIDENTERFOREGROUND:
- HFCORE_ENV->getGameInstance()->appDidEnterForeground();
+ //HFCORE_ENV->getGameInstance()->appDidEnterForeground();
break;
case SDL_WINDOWEVENT:
diff --git a/src/engine/platform/sdl/SDLOpenGLShader.cpp b/src/engine/platform/sdl/SDLOpenGLShader.cpp
index 99392ee..c53300a 100644
--- a/src/engine/platform/sdl/SDLOpenGLShader.cpp
+++ b/src/engine/platform/sdl/SDLOpenGLShader.cpp
@@ -471,7 +471,7 @@ bool SDLOpenGLShader::parsePath(const std::string &path, Type type)
std::string SDLOpenGLShader::getSource(const UString &path)
{
- // convert file with makeFilePath (needed for iOS):
+ // convert file with makeFilePath:
const int8_hf *tempUtf8 = HFCORE_FDU->makeFilePath((int8_hf *)path.toUtf8());
if (HFCORE_ENV->getPakDataFileName().length() > 0)
tempUtf8 = (int8_hf *)path.toUtf8();
diff --git a/src/engine/platform/sdl/SDLSound.cpp b/src/engine/platform/sdl/SDLSound.cpp
index a51938d..fc41c64 100644
--- a/src/engine/platform/sdl/SDLSound.cpp
+++ b/src/engine/platform/sdl/SDLSound.cpp
@@ -130,7 +130,7 @@ bool SDLSound::loadSound(const std::string &soundFileName)
return false;
}
- // convert file with makeFilePath (needed for iOS):
+ // convert file with makeFilePath:
const int8_hf *tempUtf8 = HFCORE_FDU->makeFilePath((int8_hf *)soundFileName.c_str());
if (HFCORE_ENV->getPakDataFileName().length() > 0)
tempUtf8 = (int8_hf *)soundFileName.c_str();
diff --git a/src/engine/platform/sdl/SDLSoundPlayer.cpp b/src/engine/platform/sdl/SDLSoundPlayer.cpp
index 9fa1299..e4e1f2f 100644
--- a/src/engine/platform/sdl/SDLSoundPlayer.cpp
+++ b/src/engine/platform/sdl/SDLSoundPlayer.cpp
@@ -353,7 +353,7 @@ HF_MusicType SDLSoundPlayer::getMusicType(const std::string &fileName)
memset(magic, 0, sizeof(magic));
memset(moremagic, 0, sizeof(moremagic));
- // convert file with makeFilePath (needed for iOS):
+ // convert file with makeFilePath:
const int8_hf *tempUtf8 = HFCORE_FDU->makeFilePath((int8_hf *)fileName.c_str());
if (HFCORE_ENV->getPakDataFileName().length() > 0)
tempUtf8 = (int8_hf *)fileName.c_str();
diff --git a/src/engine/platform/windows/WinD3D9Shader.cpp b/src/engine/platform/windows/WinD3D9Shader.cpp
index 851bbe5..e469dba 100644
--- a/src/engine/platform/windows/WinD3D9Shader.cpp
+++ b/src/engine/platform/windows/WinD3D9Shader.cpp
@@ -561,7 +561,7 @@ UString WinD3D9Shader::removeCompileInfo(const UString &path)
std::string WinD3D9Shader::getSource(const UString &path)
{
- // convert file with makeFilePath (needed for iOS):
+ // convert file with makeFilePath:
const int8_hf *tempUtf8 = HFCORE_FDU->makeFilePath((int8_hf *)path.toUtf8());
if (HFCORE_ENV->getPakDataFileName().length() > 0)
tempUtf8 = (int8_hf *)path.toUtf8();