Adding freetype capabilities to cimgui (#6)

* Some initial freetype work * Added freetype * Regenerated the bindings, added scripts to help with that, adjust output dir. * Deleted unneeded dlls * Moved where the DLLs live.
BindBC · Oct 13, 2021 · 56a6ecc · 56a6ecc
1 parent 10538fb
commit 56a6ecc
Show file tree

Hide file tree

Showing 25 changed files with 493 additions and 878 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 /.dub/
 lib/
 build/
+build_x64/
+build_x86/
 .dub/
 .vscode/
 
@@ -17,10 +19,6 @@ bindbc-imgui-test.exe
 libbindbc-imgui.so
 libbindbc-imgui.a
 
-SDL2.dll
-cimgui.dll
-bindbc-imgui.lib
-cimgui.dylib
 imgui.ini
 
 .DS_Store
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "deps/cimgui"]
 	path = deps/cimgui
 	url = https://github.com/Inochi2D/cimgui.git
+[submodule "deps/freetype"]
+	path = deps/freetype
+	url = https://github.com/freetype/freetype.git
diff --git a/BuildDependencies.bat b/BuildDependencies.bat
@@ -0,0 +1,11 @@
+cd deps
+mkdir build_x64
+cd build_x64
+cmake -G "Visual Studio 16 2019" -Ax64 ..
+cmake --build . --config Release
+cd ..
+mkdir build_x86
+cd build_x86
+cmake -G "Visual Studio 16 2019" -AWin32 ..
+cmake --build . --config Release
+cd ../../
diff --git a/CleanAndBuildDependencies.bat b/CleanAndBuildDependencies.bat
@@ -0,0 +1,3 @@
+rmdir /s /q deps\build
+
+BuildDependencies.bat
diff --git a/GenerateBindings.bat b/GenerateBindings.bat
@@ -0,0 +1,2 @@
+GenerateCImGuiBindings.bat
+GenerateDBindings.bat
diff --git a/GenerateCImGuiBindings.bat b/GenerateCImGuiBindings.bat
@@ -0,0 +1,4 @@
+
+cd ./deps/cimgui/generator
+luajit ./generator.lua cl "internal freetype" glfw opengl3 opengl2 sdl
+cd ../../../
diff --git a/GenerateDBindings.bat b/GenerateDBindings.bat
@@ -0,0 +1 @@
+rdmd ./generator/generator.d
diff --git a/bindbc-imgui.lib b/bindbc-imgui.lib
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -6,22 +6,59 @@ set(CMAKE_DEBUG_POSTFIX "")
 
 add_subdirectory(SDL)
 
-set(OutputDirectory ${CMAKE_CURRENT_LIST_DIR}/../lib)
+# This needs to be augmented to detect ARM vs x86
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(PlatformArchitecture x86_64)
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(PlatformArchitecture x86)
+endif()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set(PlatformFolder "win32")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(PlatformFolder "darwin")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(PlatformFolder "linux")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
+    set(PlatformFolder "android")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    set(PlatformFolder "bsd")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "MSYS")
+    set(PlatformFolder "win32")
+else ()
+    set(PlatformFolder "Unknown")
+endif()
+
+set(OutputDirectory ${CMAKE_CURRENT_LIST_DIR}/../libs/${PlatformArchitecture}/${PlatformFolder})
 
 option(BUILD_SHARED_LIBS     "Build shared instead of static libraries." ON)
 
+add_subdirectory(freetype)
+
+set(IMGUI_FREETYPE_IN_TREE "yes" CACHE STRING "freetype library is being build in-tree")
+set(IMGUI_FREETYPE "yes" CACHE STRING "Build with freetype library")
+set(IMGUI_SDL_IN_TREE "yes" CACHE STRING "SDL library is built in-tree")
 set(IMGUI_SDL "yes" CACHE STRING "Build with SDL")
+set(IMGUI_OPENGL3 "yes" CACHE STRING "Build with OpenGL3")
 add_subdirectory(cimgui)
 
 set_target_properties(cimgui PROPERTIES DEBUG_POSTFIX "")
 set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX "")
 
 set_target_properties(cimgui PROPERTIES
-    ARCHIVE_OUTPUT_DIRECTORY ${aLibraryDirectory}
-    LIBRARY_OUTPUT_DIRECTORY ${aLibraryDirectory}
-    RUNTIME_OUTPUT_DIRECTORY ${OutputDirectory})
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OutputDirectory})
+
+set_target_properties(SDL2 PROPERTIES 
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OutputDirectory})
+
+set_target_properties(freetype PROPERTIES 
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OutputDirectory})
+
+set_target_properties(cimgui PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG ${OutputDirectory})
 
 set_target_properties(SDL2 PROPERTIES 
-    ARCHIVE_OUTPUT_DIRECTORY ${OutputDirectory}
-    LIBRARY_OUTPUT_DIRECTORY ${OutputDirectory}
-    RUNTIME_OUTPUT_DIRECTORY ${OutputDirectory})
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG ${OutputDirectory})
+
+set_target_properties(freetype PROPERTIES 
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG ${OutputDirectory})
diff --git a/deps/cimgui b/deps/cimgui
diff --git a/deps/freetype b/deps/freetype
diff --git a/dub.sdl b/dub.sdl
@@ -4,8 +4,12 @@ homepage ""
 authors "Joshua T. Fisher" "Luna Nielsen"
 license "Boost"
 
-copyFiles "libs/x86_64/cimgui.dll" platform="windows-x86_64"
-copyFiles "libs/x86_64/SDL2.dll" platform="windows-x86_64"
+copyFiles "libs/x86_64/win32/cimgui.dll" platform="windows-x86_64"
+copyFiles "libs/x86_64/win32/SDL2.dll" platform="windows-x86_64"
+copyFiles "libs/x86_64/win32/freetype.dll" platform="windows-x86_64"
+copyFiles "libs/x86/win32/cimgui.dll" platform="windows-x86"
+copyFiles "libs/x86/win32/SDL2.dll" platform="windows-x86"
+copyFiles "libs/x86/win32/freetype.dll" platform="windows-x86"
 copyFiles "libs/arm64/cimgui.dylib" platform="osx-aarch64"
 //copyFiles "libs/x86_64/imgui.ini"
 

diff --git a/generator/generator.d b/generator/generator.d
@@ -60,6 +60,8 @@ shared static this()
         "signed short*": "short*",
         "signed int*": "int*",
         "int64_t" : "long",
+        "signed __int64" : "long",
+        "unsigned __int64" : "ulong",
         "uint64_t" : "ulong",
         "union { int BackupInt[2]; float BackupFloat[2];}": "union { int[2] BackupInt; float[2] BackupFloat;}",
         "const char*" : "const(char)*",
@@ -94,7 +96,7 @@ shared static this()
         "ImGui_ImplGlfw" :BackendData(
             "ImGui_ImplGlfw", 
             "Glfw", 
-            "import bindbc.sdl;",
+            "import bindbc.glfw;",
             "USE_GLFW"
         ),
         "ImGui_ImplOpenGL2" :BackendData(

diff --git a/libs/x86/win32/SDL2.dll b/libs/x86/win32/SDL2.dll
diff --git a/libs/x86/win32/cimgui.dll b/libs/x86/win32/cimgui.dll
diff --git a/libs/x86/win32/freetype.dll b/libs/x86/win32/freetype.dll
diff --git a/libs/x86_64/cimgui.dll b/libs/x86_64/cimgui.dll
diff --git a/libs/x86_64/libs_go_here.txt b/libs/x86_64/libs_go_here.txt
diff --git a/libs/x86_64/SDL2.dll → libs/x86_64/win32/SDL2.dll b/libs/x86_64/SDL2.dll → libs/x86_64/win32/SDL2.dll
diff --git a/libs/x86_64/win32/cimgui.dll b/libs/x86_64/win32/cimgui.dll
diff --git a/libs/x86_64/win32/freetype.dll b/libs/x86_64/win32/freetype.dll
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		GenerateCImGuiBindings.bat
		GenerateDBindings.bat
+22 −5		CMakeLists.txt
+1 −1		README.md
+1 −1		backend_test/CMakeLists.txt
+3 −4		backend_test/cimgui_extras.cpp
+156 −87		cimgui.cpp
+1,724 −1,655		cimgui.h
+6 −1		generator/cpp2ffi.lua
+4 −2		generator/generator.bat
+14 −33		generator/generator.lua
+4 −1		generator/output/cimgui_impl.h
+1,852 −1,427		generator/output/definitions.json
+1,815 −1,447		generator/output/definitions.lua
+89 −23		generator/output/impl_definitions.json
+81 −24		generator/output/impl_definitions.lua
+530 −362		generator/output/structs_and_enums.json
+1,216 −1,088		generator/output/structs_and_enums.lua
+6 −4		generator/output/typedefs_dict.json
+6 −4		generator/output/typedefs_dict.lua
+25 −0		generator/print_defines.cpp
+1 −1		imgui