diff options
Diffstat (limited to 'gs/psi/msvc32.mak')
| -rw-r--r-- | gs/psi/msvc32.mak | 52 |
1 files changed, 49 insertions, 3 deletions
diff --git a/gs/psi/msvc32.mak b/gs/psi/msvc32.mak index 88e2fb1eb..089ac8b13 100644 --- a/gs/psi/msvc32.mak +++ b/gs/psi/msvc32.mak @@ -181,6 +181,16 @@ MAKEDLL=1 # Define the directory where the FreeType2 library sources are stored. # See freetype.mak for more information. +!ifdef UFST_BRIDGE +!if "$(UFST_BRIDGE)"=="1" +FT_BRIDGE=0 +!endif +!endif + +!ifndef FT_BRIDGE +FT_BRIDGE=1 +!endif + !ifndef FTSRCDIR FTSRCDIR=freetype !ifndef FT_CFLAGS @@ -863,13 +873,49 @@ $(UNINSTALL_XE): $(PSOBJ)dwuninst.obj $(PSOBJ)dwuninst.res $(PSSRC)dwuninst.def DEBUGDEFS=BINDIR=.\debugbin GLGENDIR=.\debugobj GLOBJDIR=.\debugobj PSLIBDIR=.\lib PSGENDIR=.\debugobj PSOBJDIR=.\debugobj DEBUG=1 TDEBUG=1 SBRDIR=.\debugobj debug: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(DEBUGDEFS) + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) debugclean: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(DEBUGDEFS) clean + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) clean debugbsc: - nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(DEBUGDEFS) bsc + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" FT_BRIDGE=$(FT_BRIDGE) $(DEBUGDEFS) bsc + + + +# ---------------------- UFST targets ---------------------- # +# Simply set some definitions and call ourselves back # + +!ifndef UFST_ROOT +UFST_ROOT=C:\ufst +!endif + +UFSTBASEDEFS=UFST_BRIDGE=1 FT_BRIDGE=1 UFST_ROOT="$(UFST_ROOT)" +UFSTDEBUGDEFS=BINDIR=.\ufstdebugbin GLGENDIR=.\ufstdebugobj GLOBJDIR=.\ufstdebugobj PSLIBDIR=.\lib PSGENDIR=.\ufstdebugobj PSOBJDIR=.\ufstdebugobj DEBUG=1 TDEBUG=1 SBRDIR=.\ufstdebugobj +UFSTDEFS=BINDIR=.\ufstbin GLGENDIR=.\ufstobj GLOBJDIR=.\ufstobj PSLIBDIR=.\lib PSGENDIR=.\ufstobj PSOBJDIR=.\ufstobj SBRDIR=.\ufstobj + +ufst-lib: +# Could make this call a makefile in the ufst code? +# cd $(UFST_ROOT)\rts\lib +# nmake -f makefile.artifex fco_lib.a if_lib.a psi_lib.a tt_lib.a + +ufst-debug: ufst-lib + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) + +ufst-debugclean: ufst-lib + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) clean + +ufst-debugbsc: ufst-lib + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEBUGDEFS) bsc + +ufst: ufst-lib + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) + +ufst-clean: ufst-lib + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) clean + +ufst-bsc: ufst-lib + nmake -f $(MAKEFILE) DEVSTUDIO="$(DEVSTUDIO)" $(UFSTBASEDEFS) $(UFSTDEFS) bsc |