townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build integration and lumak's urho3d tweaks

Browse Source
This commit is contained in:
Crypto City 2020-01-11 15:08:56 +00:00
parent 557b7f8cd0
commit 76de76b4e9
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -201,7 +201,7 @@ if (NOT EMSCRIPTEN)
if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
add_compile_options (-g -Wall -Wextra -Wno-unused-parameter)
add_compile_options ($<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>)
add_compile_options ($<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
#add_compile_options ($<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
endif ()
endif ()
@ -246,6 +246,7 @@ if (EMSCRIPTEN)
set (TB_BUILD_GLFW OFF CACHE INTERNAL "auto")
endif (EMSCRIPTEN)
if (FALSE)
#################################################################################
#
# Add thirdparty dependencies
@ -284,6 +285,8 @@ endif ()
# Include the now-built thirdparty dependencies
add_subdirectory (thirdparty EXCLUDE_FROM_ALL)
endif()
#################################################################################
#
# Generate the config header file

4
Demo/platform/port_glfw.cpp
View File

@ -360,6 +360,8 @@ static void drop_callback(GLFWwindow *window, int count, const char **files_utf8
}
#endif
#if 0
bool AppBackendGLFW::Init(App *app)
{
if (!glfwInit())
@ -467,4 +469,6 @@ void AppBackendGLFW::OnAppEvent(const EVENT &ev)
}
}
#endif
#endif // TB_BACKEND_GLFW

5
src/tb/CMakeLists.txt
View File

@ -71,6 +71,9 @@ set (LOCAL_SRCS
renderers/tb_renderer_batcher.cpp
renderers/tb_renderer_gl.cpp
utf8/utf8.cpp
../../Demo/platform/port_glfw.cpp
../../Demo/platform/glfw_extra_linux.cpp
../../Demo/platform/glfw_extra_win.cpp
)
if (TB_BUILD_DEMO STREQUAL GLFW OR TB_BUILD_DEMO STREQUAL SDL2)
@ -107,7 +110,7 @@ if (ANDROID)
endif (TB_RENDERER MATCHES GLES_2)
else (ANDROID)
# not android, just link a static
add_library (TurboBadgerLib STATIC ${LOCAL_SRCS})
add_library (TurboBadgerLib SHARED ${LOCAL_SRCS})
endif (ANDROID)
set_property (TARGET TurboBadgerLib PROPERTY CXX_STANDARD 14)

4
src/tb/renderers/tb_renderer_batcher.h
View File

@ -46,6 +46,8 @@ public:
uint32_t batch_id;
bool is_flushing;
TBRect clipRect;
};
TBRendererBatcher();
@ -88,7 +90,7 @@ protected:
float m_u, m_v, m_uu, m_vv; ///< Some temp variables
Batch batch; ///< The one and only batch. this should be improved.
void AddQuadInternal(const TBRect &dst_rect, const TBRect &src_rect, uint32_t color, TBBitmap *bitmap, TBBitmapFragment *fragment);
virtual void AddQuadInternal(const TBRect &dst_rect, const TBRect &src_rect, uint32_t color, TBBitmap *bitmap, TBBitmapFragment *fragment);
void FlushAllInternal();
};

4
thirdparty/CMakeLists.txt vendored
View File

@ -8,6 +8,10 @@ project (turbobadger_thirdparty NONE)
include (ExternalProject)
get_directory_property (hasParent PARENT_DIRECTORY)
set(TB_BUILD_GLFW OFF)
set(TB_BUILD_SDL2 OFF)
set(TB_BUILD_FREETYPE OFF)
if (NOT WIN32)
set (DOWNLOAD_DIR "$ENV{HOME}/Downloads")
else (NOT WIN32)