changeset 1145:6a7f09909a37

merge
author sam <sam@basx.dev>
date Sat, 15 Jun 2024 11:57:05 +0700
parents af18922b416d (diff) d7891cf88359 (current diff)
children ce180935334d
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/semicongine/build.nim	Tue Jun 11 17:10:03 2024 +0700
+++ b/semicongine/build.nim	Sat Jun 15 11:57:05 2024 +0700
@@ -18,7 +18,7 @@
   STEAMLIB = currentSourcePath().parentDir().parentDir().joinPath("libs/steam_api.dll")
 else:
   raise newException(Exception, "Unsupported platform")
-let SQLITELIB_32 = currentSourcePath().parentDir().parentDir().joinPath("libs/sqlite3_32.dll")
+# let SQLITELIB_32 = currentSourcePath().parentDir().parentDir().joinPath("libs/sqlite3_32.dll")
 let SQLITELIB_64 = currentSourcePath().parentDir().parentDir().joinPath("libs/sqlite3_64.dll")
 
 proc semicongine_builddir*(buildname: string, builddir = "./build"): string =
@@ -77,7 +77,7 @@
   elif bundleType == "exe":
     switch("define", "BUILD_RESOURCEROOT=" & joinPath(getCurrentDir(), resourceRoot)) # required for in-exe packing of resources, must be absolute
   if defined(windows):
-    SQLITELIB_32.cpFile(outdir.joinPath(SQLITELIB_32.extractFilename))
+    # SQLITELIB_32.cpFile(outdir.joinPath(SQLITELIB_32.extractFilename))
     SQLITELIB_64.cpFile(outdir.joinPath(SQLITELIB_64.extractFilename))
   if withSteam:
     STEAMLIB.cpFile(outdir.joinPath(STEAMLIB.extractFilename))
--- a/semicongine/text.nim	Tue Jun 11 17:10:03 2024 +0700
+++ b/semicongine/text.nim	Sat Jun 15 11:57:05 2024 +0700
@@ -13,7 +13,7 @@
   SPACE = Rune(' ')
 
   # font shader
-  MAX_TEXT_MATERIALS = 100 # need for every different font AND color
+  MAX_TEXT_MATERIALS = 64 # need for every different font AND color
   SHADER_ATTRIB_PREFIX = "semicon_text_"
   POSITION_ATTRIB = SHADER_ATTRIB_PREFIX & "position"
   UV_ATTRIB = SHADER_ATTRIB_PREFIX & "uv"