diff --git a/CMakeLists.txt b/CMakeLists.txt index cb0eeb8..2cb284a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,10 @@ else(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() +if (WIN32) + add_definitions(-D_HAS_EXCEPTIONS=0) +endif() + if (NOT WIN32 AND NOT ANDROID) set(CMAKE_CXX_COMPILER "clang++") endif() diff --git a/kraken/KRBundleManager.cpp b/kraken/KRBundleManager.cpp index 1465e0f..6f27295 100755 --- a/kraken/KRBundleManager.cpp +++ b/kraken/KRBundleManager.cpp @@ -41,7 +41,7 @@ KRBundleManager::~KRBundleManager() { for(unordered_map::iterator itr = m_bundles.begin(); itr != m_bundles.end(); ++itr){ delete (*itr).second; } - m_bundles.empty(); + m_bundles.clear(); } KRResource* KRBundleManager::loadResource(const std::string& name, const std::string& extension, KRDataBlock* data) diff --git a/kraken/KRDataBlock.cpp b/kraken/KRDataBlock.cpp index e348801..7d7c8b7 100755 --- a/kraken/KRDataBlock.cpp +++ b/kraken/KRDataBlock.cpp @@ -439,7 +439,7 @@ void ReportWindowsLastError(LPCTSTR lpszFunction) (lstrlen((LPCTSTR)lpMsgBuf) + lstrlen((LPCTSTR)lpszFunction) + 40) * sizeof(TCHAR)); fprintf(stderr, TEXT("%s failed with error %d: %s\n"), - lpszFunction, dw, lpMsgBuf); + lpszFunction, dw, (LPCTSTR)lpMsgBuf); LocalFree(lpMsgBuf); LocalFree(lpDisplayBuf); diff --git a/kraken/KRMeshManager.cpp b/kraken/KRMeshManager.cpp index 811c5f2..1e81f33 100755 --- a/kraken/KRMeshManager.cpp +++ b/kraken/KRMeshManager.cpp @@ -99,7 +99,7 @@ KRMeshManager::~KRMeshManager() { for(unordered_multimap::iterator itr = m_models.begin(); itr != m_models.end(); ++itr){ delete (*itr).second; } - m_models.empty(); + m_models.clear(); } KRResource* KRMeshManager::loadResource(const std::string& name, const std::string& extension, KRDataBlock* data) diff --git a/kraken/KRSceneManager.cpp b/kraken/KRSceneManager.cpp index 104ed87..ac9f3e1 100755 --- a/kraken/KRSceneManager.cpp +++ b/kraken/KRSceneManager.cpp @@ -39,7 +39,7 @@ KRSceneManager::~KRSceneManager() { for(unordered_map::iterator itr = m_scenes.begin(); itr != m_scenes.end(); ++itr){ delete (*itr).second; } - m_scenes.empty(); + m_scenes.clear(); } KRResource* KRSceneManager::loadResource(const std::string& name, const std::string& extension, KRDataBlock* data)