summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/msvc_top.mak8
-rw-r--r--gs/base/Makefile.in2
-rw-r--r--gs/psi/int.mak2
-rw-r--r--gs/psi/msvc.mak2
-rw-r--r--language_switch/pspcl6_msvc.mak20
-rw-r--r--main/pcl6_gcc.mak2
6 files changed, 22 insertions, 14 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index d7d527d77..e966cf198 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -117,14 +117,14 @@ $(GENDIR)/ldgs.tr: FORCE
ZSRCDIR="$(ZSRCDIR)" ZGENDIR="$(ZGENDIR)" ZOBJDIR="$(ZOBJDIR)" ZLIB_NAME="$(ZLIB_NAME)" SHARE_ZLIB="$(SHARE_ZLIB)" \
PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \
PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\
- FTSRCDIR="$(FTSRCDIR)" \
DEVSTUDIO="$(DEVSTUDIO)" \
XCFLAGS="$(XCFLAGS)" \
SBRFLAGS="$(SBRFLAGS)" \
COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \
UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \
UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \
- UFST_CFLAGS="$(UFST_CFLAGS)" \
+ UFST_CFLAGS="$(UFST_CFLAGS)" UFSTROMFONTDIR="$(UFSTROMFONTDIR)" UFSTDISCFONTDIR="$(UFSTDISCFONTDIR)"\
+ FT_BRIDGE=$(FT_BRIDGE) SHARE_FT=$(SHARE_FT) FTSRCDIR=$(FTSRCDIR) FT_CFLAGS=$(FT_CFLAGS) FT_LIBS=$(FT_LIBS) \
FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \
BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \
CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \
@@ -164,14 +164,14 @@ $(GENDIR)/ldgs.tr: FORCE
ZSRCDIR="$(ZSRCDIR)" ZGENDIR="$(ZGENDIR)" ZOBJDIR="$(ZOBJDIR)" ZLIB_NAME="$(ZLIB_NAME)" SHARE_ZLIB="$(SHARE_ZLIB)" \
PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \
PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\
- FTSRCDIR="$(FTSRCDIR)" \
DEVSTUDIO="$(DEVSTUDIO)" \
XCFLAGS="$(XCFLAGS)" \
SBRFLAGS="$(SBRFLAGS)" \
COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS="$(PCLXL_ROMFS_ARGS)" PJL_ROMFS_ARGS="$(PJL_ROMFS_ARGS)" \
UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \
UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" \
- UFST_CFLAGS="$(UFST_CFLAGS)" \
+ UFST_CFLAGS="$(UFST_CFLAGS)" UFSTROMFONTDIR="$(UFSTROMFONTDIR)" UFSTDISCFONTDIR="$(UFSTDISCFONTDIR)"\
+ FT_BRIDGE=$(FT_BRIDGE) SHARE_FT=$(SHARE_FT) FTSRCDIR=$(FTSRCDIR) FT_CFLAGS=$(FT_CFLAGS) FT_LIBS=$(FT_LIBS) \
PSD="$(GENDIR)/" \
FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \
BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \
diff --git a/gs/base/Makefile.in b/gs/base/Makefile.in
index e4da971bc..e5af1b892 100644
--- a/gs/base/Makefile.in
+++ b/gs/base/Makefile.in
@@ -178,7 +178,7 @@ UFST_ROMFS_ARGS?=-b \
-c -P $(PSSRCDIR)/../lib/ -d Resource/Init/ FAPIconfig-FCO
UFSTROMFONTDIR=\"%rom%fontdata/\"
-UFSTFONTDIR?=\"$(UFST_ROOT)/fontdata/\"
+UFSTDISCFONTDIR?=\"$(UFST_ROOT)/fontdata/\"
UFST_CFLAGS=@UFST_CFLAGS@
diff --git a/gs/psi/int.mak b/gs/psi/int.mak
index 82e688062..4c21b1ff9 100644
--- a/gs/psi/int.mak
+++ b/gs/psi/int.mak
@@ -1917,7 +1917,7 @@ fapiufst_0 : $(PSSRC)fapiufst.c $(AK)\
$(UFST_ROOT)$(D)rts$(D)psi$(D)t1isfnt.h\
$(UFST_ROOT)$(D)rts$(D)tt$(D)sfntenum.h\
$(UFST_ROOT)$(D)rts$(D)tt$(D)ttpcleo.h
- $(PSCC) $(UFST_CFLAGS) -DUFSTFONTDIR=$(UFSTFONTDIR) $(UFST_INC) $(PSO_)fapiufst.$(OBJ) $(C_) $(PSSRC)fapiufst.c
+ $(PSCC) $(UFST_CFLAGS) -DUFSTFONTDIR=$(UFSTDISCFONTDIR) $(UFST_INC) $(PSO_)fapiufst.$(OBJ) $(C_) $(PSSRC)fapiufst.c
$(PSOBJ)fapiufst.$(OBJ) : fapiufst_$(COMPILE_INITS)
diff --git a/gs/psi/msvc.mak b/gs/psi/msvc.mak
index c57d11242..76fedccee 100644
--- a/gs/psi/msvc.mak
+++ b/gs/psi/msvc.mak
@@ -1059,7 +1059,7 @@ UFST_ROMFS_ARGS=-b \
-c -P $(PSSRCDIR)/../lib/ -d Resource/Init/ FAPIconfig-FCO
UFSTROMFONTDIR=\\\"%%%%%rom%%%%%fontdata/\\\"
-UFSTFONTDIR="$(UFST_ROOT)/fontdata"
+UFSTDISCFONTDIR="$(UFST_ROOT)/fontdata"
UFSTBASEDEFS=UFST_BRIDGE=1 FT_BRIDGE=1 UFST_ROOT="$(UFST_ROOT)" UFST_ROMFS_ARGS="$(UFST_ROMFS_ARGS)" UFSTFONTDIR="$(UFSTFONTDIR)" UFSTROMFONTDIR="$(UFSTROMFONTDIR)"
diff --git a/language_switch/pspcl6_msvc.mak b/language_switch/pspcl6_msvc.mak
index 245c1b0aa..bd9db3573 100644
--- a/language_switch/pspcl6_msvc.mak
+++ b/language_switch/pspcl6_msvc.mak
@@ -115,16 +115,22 @@ BAND_LIST_STORAGE=file
COMPILE_INITS=1
!endif
-!ifdef UFST_BRIDGE
-!if "$(UFST_BRIDGE)"=="1"
-FT_BRIDGE=0
+!ifndef FT_BRIDGE
+FT_BRIDGE=1
!endif
+
+SHARE_FT=0
+
+!ifndef FTSRCDIR
+FTSRCDIR=$(GLSRCDIR)/../freetype
!endif
-!ifndef FT_BRIDGE
-FT_BRIDGE=1
+!ifndef FT_CFLAGS
+FT_CFLAGS=-I$(FTSRCDIR)/include
!endif
+FT_LIBS=""
+
!ifndef APP_CCC
APP_CCC=$(CC_) -I..\pl -I..\gs\base -I.\obj $(C_)
!endif
@@ -166,8 +172,10 @@ PXL_FONT_SCALER=$(PL_SCALER)
!if "$(COMPILE_INITS)" == "1"
UFSTFONTDIR=%rom%fontdata/
+UFSTROMFONTDIR=\\\"%%%%%rom%%%%%fontdata/\\\"
!else
UFSTFONTDIR=../fontdata/
+UFSTDISCFONTDIR=\"$(UFST_ROOT)/fontdata/\"
!endif
!ifndef UFST_ROOT
@@ -177,10 +185,8 @@ UFST_ROOT="../ufst"
FAPI_DEFS= -DUFST_BRIDGE=1 -DUFST_LIB_EXT=.lib -DGCCx86 -DUFST_ROOT=$(UFST_ROOT)
!endif
-!if $(FT_BRIDGE)!=1
UFST_BRIDGE=1
UFST_LIB_EXT=.lib
-!endif
# specify agfa library locations and includes.
UFST_LIB=$(UFST_ROOT)\rts\lib
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index 5e694faa9..55ad9892a 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -160,8 +160,10 @@ ifeq ($(PL_SCALER), ufst)
-P $(UFST_ROOT)/fontdata/mtfonts/pclps2/mt3/ -d fontdata/mtfonts/pclps2/mt3/ pclp2_xj.fco \
-c -P $(PSSRCDIR)/../lib/ -d Resource/Init/ FAPIconfig-FCO
UFSTFONTDIR?=%rom%fontdata/
+ UFSTROMFONTDIR=\"%rom%fontdata/\"
else
UFSTFONTDIR?=/usr/local/fontdata5.0/
+ UFSTDISCFONTDIR=\"$(UFST_ROOT)/fontdata/\"
endif
EXTRALIBS?= $(UFST_LIB)if_lib.a $(UFST_LIB)fco_lib.a $(UFST_LIB)tt_lib.a $(UFST_LIB)if_lib.a
endif # PL_SCALER
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 12:58:03 +0000