diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:48:48 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:48:48 +0000 |
commit | c6fb62e03853e7fb1d0bf0299fd54fa1ac680bf3 (patch) | |
tree | 904d2a780d3986ec572bc908167c7f79042b495f /Build/source/texk/web2c/xetexdir/am/xetex.am | |
parent | a47b1f51fb0bd69c3fb6f6d5d5b8c8192bc03fb9 (diff) |
XeTeX: Adapt to W32TeX
Use Automake generated rule for ObjC++ file
git-svn-id: svn://tug.org/texlive/trunk@27713 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/am/xetex.am')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 7291ac414e9..7243a75b0f0 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -31,9 +31,6 @@ if XETEX_MACOSX xetex_cppflags += -DXETEX_MAC xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -## Extra library for the Objective C++ file xetexdir/XeTeXFontMgr_Mac.mm. -libxetex += libxetexmm.a - else !XETEX_MACOSX xetex_cppflags += -DXETEX_OTHER @@ -124,8 +121,7 @@ EXTRA_LIBRARIES += libxetex.a libxetex_a_CPPFLAGS = $(xetex_cppflags) libxetex_a_CFLAGS = # $(WARNING_CFLAGS) libxetex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) -## Not yet for ObjC++ (not yet implemented) -libxetex_a_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) +libxetex_a_OBJCXXFLAGS = # $(WARNING_OBJCXXFLAGS) libxetex_a_SOURCES = \ xetexdir/MathTable.h \ @@ -162,6 +158,8 @@ if XETEX_MACOSX libxetex_a_SOURCES += \ xetexdir/XeTeXFontInst_Mac.cpp \ xetexdir/XeTeXFontInst_Mac.h \ + xetexdir/XeTeXFontMgr_Mac.mm \ + xetexdir/XeTeXFontMgr_Mac.h \ xetexdir/XeTeX_mac.c else !XETEX_MACOSX @@ -197,27 +195,6 @@ endif XETEX_GRAPHITE libxetex_prereq = xetexd.h $(xetex_dependencies) $(libxetex_a_OBJECTS): $(libxetex_prereq) -## libxetexmm (Mac OS X only) -## -## Automake (1.10.2) does not generate a rule to compile -## the Objective C++ file xetexdir/XeTeXFontMgr_Mac.mm. -## Since this file is to be compiled with '$(CXX) -ObjC++' we provide a -## C++ wrapper xetexdir/XeTeXFontMgr_Mac.cpp including the Objective C++ file. -## Since Automake does not allow to specify CXXFLAGS for individual objects, -## we use an additional library libxetexmm.a. -EXTRA_LIBRARIES += libxetexmm.a - -libxetexmm_a_CPPFLAGS = $(xetex_cppflags) - -libxetexmm_a_CXXFLAGS = -ObjC++ - -libxetexmm_a_SOURCES = \ - xetexdir/XeTeXFontMgr_Mac.cpp \ - xetexdir/XeTeXFontMgr_Mac.h - -## included by xetexdir/XeTeXFontMgr_Mac.cpp -EXTRA_DIST += xetexdir/XeTeXFontMgr_Mac.mm - EXTRA_DIST += xetexdir/ChangeLog # XeTeX Tests |