try font location for clean checkout

Author: pbsurf

.github/workflows/write-ci.yml

@@ -19,7 +19,7 @@ jobs:
         submodules: recursive
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y libsdl2-dev
-    - run: make DEBUG=1 USE_SYSTEM_SDL=1
+    - run: make DEBUG=1 SANITIZE=0 USE_SYSTEM_SDL=1
       working-directory: syncscribble
-    - run: ./Debug/Write --test
+    - run: ./Debug/Write --glRender=0 --test
       working-directory: syncscribble

syncscribble/Makefile

@@ -283,11 +283,6 @@ else
   endif
 endif
 
-ifneq ($(DEBUG), 0)
-  # use asan by default for debug build
-  SANITIZE = 1
-endif
-
 # must use this instead of just -lpthread so the defines needed by force_glibc.h are created
 CFLAGS = -pthread
 # X11 and Xi needed for linuxtablet.c

syncscribble/Makefile.unix

@@ -21,12 +21,14 @@ ifneq ($(DEBUG), 0)
   # rdynamic needed to get backtrace symbols from, e.g., catchsegv
   LDFLAGS += -rdynamic
   BUILDDIR ?= Debug
+  # enable asan by default for debug build
+  SANITIZE ?= 1
 else
   CFLAGS += -O2 -DNDEBUG
   BUILDDIR ?= Release
+  SANITIZE ?= 0
 endif
 
-SANITIZE ?= 0
 ifneq ($(SANITIZE), 0)
   CFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero
   LDFLAGS += -lasan -lubsan

syncscribble/resources.cpp

@@ -88,12 +88,16 @@ void setupResources()
   const char* sans = "SanFranciscoDisplay-Regular.otf";
   const char* fallback = "DroidSansFallback.ttf";
 #elif PLATFORM_LINUX
-  const char* fontpath = Application::appDir.c_str();
-  FSPath sansPath(fontpath, "Roboto-Regular.ttf");
-  FSPath fallbackPath(fontpath, "DroidSansFallback.ttf");
+  FSPath fontpath(Application::appDir);
+  FSPath sansPath = fontpath.child("Roboto-Regular.ttf");
+  if(!sansPath.exists()) {
+     fontpath = FSPath(Application::appDir, "../../scribbleres/fonts/");
+     sansPath = fontpath.child("Roboto-Regular.ttf");
+  }
+  FSPath fallbackPath = fontpath.child("DroidSansFallback.ttf");
   const char* sans = sansPath.c_str();
   const char* fallback = fallbackPath.c_str();
-  //sansBoldPath = FSPath(fontpath, "Roboto-Bold.ttf");
+  sansBackupPath = FSPath("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf");
   //sansItalicPath = FSPath(fontpath, "Roboto-Italic.ttf");
 #elif PLATFORM_EMSCRIPTEN
   Painter::loadFontMem("ui-sans", Roboto_Regular_ttf, Roboto_Regular_ttf_len);