fix built-in font (requires patched ftgl)

Ast-x64 · Feb 13, 2015 · 2ccd689 · 2ccd689
1 parent 526818f
commit 2ccd689
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/common.mak b/common.mak
@@ -97,17 +97,13 @@ ifeq ($(LV2AVAIL)$(HAVE_UI), yesyes)
     UILIBS+=`pkg-config --variable=libdir ftgl`/libftgl.a `pkg-config --variable=libdir ftgl`/libfreetype.a
     UILIBS+=-lm -mmacosx-version-min=10.5
     UI_TYPE=CocoaUI
-    UICFLAGS+=-DBUILTINFONT
-    override FONTFILE=verabd.h
   else
     ifeq ($(IS_WIN), yes)
       UIDEPS+=../pugl/pugl_win.cpp
       UILIBS=../pugl/pugl_win.cpp
       UILIBS+=`pkg-config --variable=libdir ftgl`/libftgl.a `pkg-config --variable=libdir ftgl`/libfreetype.a
       UILIBS+=-lws2_32 -lwinmm -lopengl32 -lglu32 -lgdi32 -lcomdlg32 -lpthread
       UI_TYPE=WindowsUI
-      UICFLAGS+=-DBUILTINFONT
-      override FONTFILE=verabd.h
     else
       UIDEPS+=../pugl/pugl_x11.c
       override CFLAGS+=`pkg-config --cflags glu`

diff --git a/x-lnx-bundle.sh b/x-lnx-bundle.sh
@@ -30,7 +30,6 @@ export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
 
 make clean
 
-# TODO BUILTINFONT
 make \
 	CFLAGS="-I${PREFIX}/include -fvisibility=hidden -DNDEBUG -msse -msse2 -mfpmath=sse -fomit-frame-pointer -O3 -mstackrealign -fno-finite-math-only -I${PREFIX}/src -DUSE_WEAK_JACK -DBUILTINFONT" \
 	LDFLAGS="-L${PREFIX}/lib -fvisibility=hidden" \

diff --git a/x-osx-bundle.sh b/x-osx-bundle.sh
@@ -22,9 +22,10 @@ PKG_CONFIG_PATH=${SBFSTACK}/lib/pkgconfig
 make clean
 make \
 	ENABLE_CONVOLUTION=no \
-	CFLAGS="-msse -msse2 -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only ${OSXCOMPAT} ${SBFARCH} -I${SBFSTACK}/src -DUSE_WEAK_JACK" \
+	CFLAGS="-msse -msse2 -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only ${OSXCOMPAT} ${SBFARCH} -I${SBFSTACK}/src -DUSE_WEAK_JACK -DBUILTINFONT" \
 	IRPATH="../Resources/ir" \
 	WEAKJACK="${SBFSTACK}/src/weakjack/weak_libjack.c" \
+	FONTFILE=verabd.h \
 	SUBDIRS="b_synth ui" \
 	|| exit
 

diff --git a/x-win-bundle.sh b/x-win-bundle.sh
@@ -28,10 +28,11 @@ make \
 
 make \
   XWIN=${XPREFIX} \
-	CFLAGS="-I${PREFIX}/include -fvisibility=hidden -DNDEBUG -DPTW32_STATIC_LIB -msse -msse2 -mfpmath=sse -fomit-frame-pointer -O3 -mstackrealign -fno-finite-math-only -I${PREFIX}/src -DUSE_WEAK_JACK" \
+	CFLAGS="-I${PREFIX}/include -fvisibility=hidden -DNDEBUG -DPTW32_STATIC_LIB -msse -msse2 -mfpmath=sse -fomit-frame-pointer -O3 -mstackrealign -fno-finite-math-only -I${PREFIX}/src -DUSE_WEAK_JACK -DBUILTINFONT" \
 	LDFLAGS="-L${PREFIX}/lib -fvisibility=hidden" \
 	ENABLE_CONVOLUTION=no \
 	WEAKJACK="${PREFIX}/src/weakjack/weak_libjack.c" \
+	FONTFILE=verabd.h \
 	SUBDIRS="b_synth ui" \
 	$@