From 76de76b4e9bdf272ba1aeae24ea5d7f1ffbcf8c5 Mon Sep 17 00:00:00 2001
From: Crypto City <cryptocity@example.com>
Date: Sat, 11 Jan 2020 15:08:56 +0000
Subject: [PATCH] build integration and lumak's urho3d tweaks
---
CMakeLists.txt | 5 ++++-
Demo/platform/port_glfw.cpp | 4 ++++
src/tb/CMakeLists.txt | 5 ++++-
src/tb/renderers/tb_renderer_batcher.h | 4 +++-
thirdparty/CMakeLists.txt | 4 ++++
5 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb3cc07..b9d1a16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/Demo/platform/port_glfw.cpp b/Demo/platform/port_glfw.cpp
index eab675c..7087a13 100644
--- a/Demo/platform/port_glfw.cpp
+++ b/Demo/platform/port_glfw.cpp
@@ -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
diff --git a/src/tb/CMakeLists.txt b/src/tb/CMakeLists.txt
index 0a67705..8295163 100644
--- a/src/tb/CMakeLists.txt
+++ b/src/tb/CMakeLists.txt
@@ -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)
diff --git a/src/tb/renderers/tb_renderer_batcher.h b/src/tb/renderers/tb_renderer_batcher.h
index b5a18c2..ca5d42e 100644
--- a/src/tb/renderers/tb_renderer_batcher.h
+++ b/src/tb/renderers/tb_renderer_batcher.h
@@ -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();
};
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 5683a2a..34aaa5e 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -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)