Changes to last commit. Maybe add FW_LUA, FW_SOUND, etc definitions further
This commit is contained in:
parent
962e9c7d16
commit
9523b5cde5
|
@ -1,6 +1,8 @@
|
|||
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
|
||||
PROJECT(otclient)
|
||||
|
||||
ADD_DEFINITIONS(-DFW_WINDOW)
|
||||
|
||||
INCLUDE(src/framework/CMakeLists.txt)
|
||||
INCLUDE(src/otclient/CMakeLists.txt)
|
||||
|
||||
|
|
|
@ -177,8 +177,8 @@ SET(framework_SOURCES ${framework_SOURCES}
|
|||
${CMAKE_CURRENT_LIST_DIR}/core/configmanager.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/configmanager.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/declarations.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/event.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/event.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/event.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/eventdispatcher.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/eventdispatcher.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/filestream.cpp
|
||||
|
@ -192,8 +192,8 @@ SET(framework_SOURCES ${framework_SOURCES}
|
|||
${CMAKE_CURRENT_LIST_DIR}/core/modulemanager.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/resourcemanager.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/resourcemanager.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/scheduledevent.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/scheduledevent.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/scheduledevent.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/timer.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/core/timer.h
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ void Logger::log(Fw::LogLevel level, const std::string& message)
|
|||
}
|
||||
|
||||
if(level == Fw::LogFatal) {
|
||||
#ifdef OTCLIENT
|
||||
#ifdef FW_WINDOW
|
||||
g_window.displayFatalError(message);
|
||||
#endif
|
||||
ignoreLogs = true;
|
||||
|
|
Loading…
Reference in New Issue