diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-06-19 17:09:53 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2013-06-20 16:45:44 +0200 |
| commit | 643370f04348569b5e5e577660031d638537671c (patch) | |
| tree | da9b1bc196b272a7d95a8b446fd69a00644aeab0 | |
| parent | 0a927854a10e1e6b9770a81e2e1d9f3093631757 (diff) | |
| download | mupdf-643370f04348569b5e5e577660031d638537671c.tar.xz | |
Update source, makefiles and win32 projects.
| -rw-r--r-- | Makefile | 230 | ||||
| -rw-r--r-- | Makethird | 6 | ||||
| -rw-r--r-- | include/mupdf/img.h (renamed from include/mupdf/image.h) | 0 | ||||
| -rw-r--r-- | platform/win32/generate.bat | 38 | ||||
| -rw-r--r-- | platform/win32/generated.vcproj | 726 | ||||
| -rw-r--r-- | platform/win32/libmupdf-js-none.vcproj (renamed from platform/win32/libmupdf-nov8.vcproj) | 144 | ||||
| -rw-r--r-- | platform/win32/libmupdf-js-v8.vcproj | 352 | ||||
| -rw-r--r-- | platform/win32/libmupdf-v8.vcproj | 232 | ||||
| -rw-r--r-- | platform/win32/libmupdf.vcproj | 907 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 432 | ||||
| -rw-r--r-- | platform/win32/mudraw.vcproj | 8 | ||||
| -rw-r--r-- | platform/win32/mujstest-v8.vcproj | 46 | ||||
| -rw-r--r-- | platform/win32/mupdf-v8.vcproj | 48 | ||||
| -rw-r--r-- | platform/win32/mupdf.sln | 28 | ||||
| -rw-r--r-- | platform/win32/mupdf.vcproj | 42 | ||||
| -rw-r--r-- | platform/win32/mutool.vcproj | 18 | ||||
| -rw-r--r-- | scripts/cmapdump.c | 22 | ||||
| -rw-r--r-- | source/img/muimage.c | 2 |
18 files changed, 1448 insertions, 1833 deletions
@@ -5,14 +5,14 @@ build ?= debug OUT := build/$(build) GEN := generated -# --- Variables, Commands, etc... --- - default: all +# --- Configuration --- + # Do not specify CFLAGS or LIBS on the make invocation line - specify # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that # set a variable that was set on the command line. -CFLAGS += $(XCFLAGS) -Iinclude -Iscripts -I$(GEN) -Iucdn +CFLAGS += $(XCFLAGS) -Iinclude -Iscripts -I$(GEN) LIBS += $(XLIBS) -lm include Makerules @@ -39,6 +39,8 @@ CFLAGS += $(OPENJPEG_CFLAGS) CFLAGS += $(OPENSSL_CFLAGS) CFLAGS += $(ZLIB_CFLAGS) +# --- Commands --- + ifeq "$(verbose)" "" QUIET_AR = @ echo ' ' ' ' AR $@ ; QUIET_CC = @ echo ' ' ' ' CC $@ ; @@ -56,15 +58,70 @@ LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ RM_CMD = $(QUIET_RM) rm -f $@ -# --- Rules --- +# --- File lists --- + +ALL_DIR := $(OUT)/fitz +ALL_DIR += $(OUT)/pdf $(OUT)/pdf/js +ALL_DIR += $(OUT)/xps +ALL_DIR += $(OUT)/cbz +ALL_DIR += $(OUT)/img +ALL_DIR += $(OUT)/tools +ALL_DIR += $(OUT)/platform/x11 FITZ_HDR := include/mupdf/fitz.h $(wildcard include/mupdf/fitz/*.h) PDF_HDR := include/mupdf/pdf.h $(wildcard include/mupdf/pdf/*.h) XPS_HDR := include/mupdf/xps.h CBZ_HDR := include/mupdf/cbz.h -IMG_HDR := include/mupdf/image.h +IMG_HDR := include/mupdf/img.h + +FITZ_SRC := $(wildcard source/fitz/*.c) +PDF_SRC := $(wildcard source/pdf/*.c) +XPS_SRC := $(wildcard source/xps/*.c) +CBZ_SRC := $(wildcard source/cbz/*.c) +IMG_SRC := $(wildcard source/img/*.c) + +FITZ_SRC_HDR := $(wildcard source/fitz/*.h) +PDF_SRC_HDR := $(wildcard source/pdf/*.h) +XPS_SRC_HDR := $(wildcard source/xps/*.h) +CBZ_SRC_HDR := $(wildcard source/cbz/*.h) +IMG_SRC_HDR := $(wildcard source/img/*.h) + +FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC)))) +PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC)))) +XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC)))) +CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) +IMG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(IMG_SRC)))) + +PDF_JS_V8_OBJ := $(OUT)/pdf/js/pdf-js.o $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o +PDF_JS_NONE_OBJ := $(OUT)/pdf/js/pdf-js-none.o + +$(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR) +$(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) +$(XPS_OBJ) : $(FITZ_HDR) $(XPS_HDR) $(XPS_SRC_HDR) +$(CBZ_OBJ) : $(FITZ_HDR) $(CBZ_HDR) $(CBZ_SRC_HDR) +$(IMG_OBJ) : $(FITZ_HDR) $(IMG_HDR) $(IMG_SRC_HDR) + +$(PDF_JS_V8_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) +$(PDF_JS_NONE_OBJ) := $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) + +# --- Library --- + +MUPDF_LIB := $(OUT)/libmupdf.a +MUPDF_JS_NONE_LIB := $(OUT)/libmupdf-js-none.a -$(OUT) $(GEN) : +$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(IMG_OBJ) +$(MUPDF_JS_NONE_LIB) : $(PDF_JS_NONE_OBJ) + +ifeq "$(V8_PRESENT)" "yes" +MUPDF_JS_V8_LIB := $(OUT)/libmupdf-js-v8.a +$(MUPDF_JS_V8_LIB) : $(PDF_JS_V8_OBJ) +endif + +INSTALL_LIBS := $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(MUPDF_JS_V8_LIB) + +# --- Rules --- + +$(ALL_DIR) $(OUT) $(GEN) : $(MKDIR_CMD) $(OUT)/%.a : @@ -72,68 +129,23 @@ $(OUT)/%.a : $(AR_CMD) $(RANLIB_CMD) -$(OUT)/% : $(OUT)/%.o +$(OUT)/%: $(OUT)/%.o $(LINK_CMD) -$(OUT)/%.o : fitz/%.c $(FITZ_HDR) $(wildcard fitz/*.h) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : draw/%.c $(FITZ_HDR) $(wildcard draw/*.h) | $(OUT) +$(OUT)/%.o : source/%.c | $(ALL_DIR) $(CC_CMD) -$(OUT)/%.o : pdf/%.c $(FITZ_HDR) $(PDF_HDR) $(wildcard pdf/*.h) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : pdf/%.cpp $(FITZ_HDR) $(PDF_HDR) $(wildcard pdf/*.h) | $(OUT) + +$(OUT)/%.o : source/%.cpp | $(ALL_DIR) $(CXX_CMD) -$(OUT)/%.o : xps/%.c $(FITZ_HDR) $(XPS_HDR) $(wildcard xps/*.h) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : cbz/%.c $(FITZ_HDR) $(CBZ_HDR) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : image/%.c $(FITZ_HDR) $(IMG_HDR) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : ucdn/%.c | $(OUT) - $(CC_CMD) + $(OUT)/%.o : scripts/%.c | $(OUT) $(CC_CMD) -$(OUT)/x11_%.o : apps/x11_%.c $(FITZ_HDR) | $(OUT) +$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR) $(CC_CMD) $(X11_CFLAGS) -$(OUT)/%.o : apps/%.c $(FITZ_HDR) $(PDF_HDR) | $(OUT) - $(CC_CMD) - - .PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules -# --- Fitz, MuPDF, MuXPS and MuCBZ library --- - -MUPDF_LIB := $(OUT)/libmupdf.a -MUPDF_V8_LIB := $(OUT)/libmupdf-v8.a - -FITZ_SRC := $(notdir $(wildcard fitz/*.c draw/*.c ucdn/*.c)) -FITZ_SRC := $(filter-out draw_simple_scale.c, $(FITZ_SRC)) -PDF_ALL_SRC := $(notdir $(wildcard pdf/*.c)) -PDF_SRC := $(filter-out pdf_js.c pdf_jsimp_cpp.c, $(PDF_ALL_SRC)) -PDF_V8_SRC := $(filter-out pdf_js_none.c, $(PDF_ALL_SRC)) -PDF_V8_CPP_SRC := $(notdir $(wildcard pdf/*.cpp)) -XPS_SRC := $(notdir $(wildcard xps/*.c)) -CBZ_SRC := $(notdir $(wildcard cbz/*.c)) -IMG_SRC := $(notdir $(wildcard image/*.c)) - -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(PDF_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(XPS_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(CBZ_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(IMG_SRC:%.c=%.o)) - -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(PDF_V8_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(PDF_V8_CPP_SRC:%.cpp=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(XPS_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(CBZ_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(IMG_SRC:%.c=%.o)) - -libs: $(MUPDF_LIB) $(THIRD_LIBS) -libs_v8: libs $(MUPDF_V8_LIB) - # --- Generated CMAP, FONT and JAVASCRIPT files --- CMAPDUMP := $(OUT)/cmapdump @@ -141,14 +153,15 @@ FONTDUMP := $(OUT)/fontdump CQUOTE := $(OUT)/cquote BIN2HEX := $(OUT)/bin2hex -CMAP_CNS_SRC := $(wildcard cmaps/cns/*) -CMAP_GB_SRC := $(wildcard cmaps/gb/*) -CMAP_JAPAN_SRC := $(wildcard cmaps/japan/*) -CMAP_KOREA_SRC := $(wildcard cmaps/korea/*) -FONT_BASE14_SRC := $(wildcard fonts/*.cff) -FONT_DROID_SRC := fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf -FONT_CJK_SRC := fonts/droid/DroidSansFallback.ttf -FONT_CJK_FULL_SRC := fonts/droid/DroidSansFallbackFull.ttf +CMAP_CNS_SRC := $(wildcard resources/cmaps/cns/*) +CMAP_GB_SRC := $(wildcard resources/cmaps/gb/*) +CMAP_JAPAN_SRC := $(wildcard resources/cmaps/japan/*) +CMAP_KOREA_SRC := $(wildcard resources/cmaps/korea/*) + +FONT_BASE14_SRC := $(wildcard resources/fonts/*.cff) +FONT_DROID_SRC := resources/fonts/droid/DroidSans.ttf resources/fonts/droid/DroidSansMono.ttf +FONT_CJK_SRC := resources/fonts/droid/DroidSansFallback.ttf +FONT_CJK_FULL_SRC := resources/fonts/droid/DroidSansFallbackFull.ttf $(GEN)/gen_cmap_cns.h : $(CMAP_CNS_SRC) $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CNS_SRC) @@ -172,12 +185,12 @@ $(GEN)/gen_font_cjk_full.h : $(FONT_CJK_FULL_SRC) FONT_GEN := $(GEN)/gen_font_base14.h $(GEN)/gen_font_droid.h $(GEN)/gen_font_cjk.h $(GEN)/gen_font_cjk_full.h -JAVASCRIPT_SRC := pdf/pdf_util.js +JAVASCRIPT_SRC := source/pdf/js/pdf-util.js JAVASCRIPT_GEN := $(GEN)/gen_js_util.h $(JAVASCRIPT_GEN) : $(JAVASCRIPT_SRC) $(QUIET_GEN) $(CQUOTE) $@ $(JAVASCRIPT_SRC) -ADOBECA_SRC := certs/AdobeCA.p7c +ADOBECA_SRC := resources/certs/AdobeCA.p7c ADOBECA_GEN := $(GEN)/gen_adobe_ca.h $(ADOBECA_GEN) : $(ADOBECA_SRC) $(QUIET_GEN) $(BIN2HEX) $@ $(ADOBECA_SRC) @@ -191,50 +204,55 @@ endif generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) -$(OUT)/pdf_cmap_table.o : $(CMAP_GEN) -$(OUT)/pdf_fontfile.o : $(FONT_GEN) -$(OUT)/pdf_js.o : $(JAVASCRIPT_GEN) -$(OUT)/crypt_pkcs7.o : $(ADOBECA_GEN) -$(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c +$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN) +$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN) +$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN) +$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN) +$(OUT)/cmapdump.o : source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c # --- Tools and Apps --- MUDRAW := $(addprefix $(OUT)/, mudraw) -$(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUDRAW) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUDRAW) : $(addprefix $(OUT)/tools/, mudraw.o) + $(LINK_CMD) MUTOOL := $(addprefix $(OUT)/, mutool) -$(MUTOOL) : $(addprefix $(OUT)/, pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) $(MUPDF_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) + $(LINK_CMD) -ifeq "$(NOX11)" "" +ifeq "$(V8_PRESENT)" "yes" +MUJSTEST_V8 := $(OUT)/mujstest-v8 +$(MUJSTEST_V8) : $(MUPDF_LIB) $(MUPDF_JS_V8_LIB) $(THIRD_LIBS) +$(MUJSTEST_V8) : $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) + $(LINK_CMD) $(V8_LIBS) +endif +ifeq "$(NOX11)" "" MUVIEW := $(OUT)/mupdf -$(MUVIEW) : $(MUPDF_LIB) $(THIRD_LIBS) -$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) +$(MUVIEW) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUVIEW) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) +endif +ifeq "$(V8_PRESENT)" "yes" +ifeq "$(NOX11)" "" MUVIEW_V8 := $(OUT)/mupdf-v8 -$(MUVIEW_V8) : $(MUPDF_V8_LIB) $(THIRD_LIBS) -$(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) +$(MUVIEW_V8) : $(MUPDF_LIB) $(MUPDF_JS_V8_LIB) $(THIRD_LIBS) +$(MUVIEW_V8) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) $(V8_LIBS) endif - -MUJSTEST_V8 := $(OUT)/mujstest-v8 -$(MUJSTEST_V8) : $(MUPDF_V8_LIB) $(THIRD_LIBS) -$(MUJSTEST_V8) : $(addprefix $(OUT)/, jstest_main.o pdfapp.o) - $(LINK_CMD) $(V8_LIBS) - -ifeq "$(V8_PRESENT)" "1" -JSTARGETS := $(MUJSTEST_V8) $(MUPDF_V8_LIB) $(MUVIEW_V8) -else -JSTARGETS := endif +INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST_V8) $(MUVIEW_V8) + # --- Format man pages --- %.txt: %.1 nroff -man $< | col -b | expand > $@ -MAN_FILES := $(wildcard apps/man/*.1) +MAN_FILES := $(wildcard docs/man/*.1) TXT_FILES := $(MAN_FILES:%.1=%.txt) catman: $(TXT_FILES) @@ -247,27 +265,39 @@ libdir ?= $(prefix)/lib incdir ?= $(prefix)/include mandir ?= $(prefix)/share/man -install: $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1 - install $(MUPDF_LIB) $(DESTDIR)$(libdir) - install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h image/muimage.h $(DESTDIR)$(incdir) - install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir) - install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1 +third: $(THIRD_LIBS) +libs: $(INSTALL_LIBS) +apps: $(INSTALL_APPS) + +install: libs apps + install -d $(DESTDIR)$(incdir)/mupdf + install -d $(DESTDIR)$(incdir)/mupdf/fitz + install -d $(DESTDIR)$(incdir)/mupdf/pdf + install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf + install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz + install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf + + install -d $(DESTDIR)$(libdir) + install $(INSTALL_LIBS) $(DESTDIR)$(libdir) + + install -d $(DESTDIR)$(bindir) + install $(INSTALL_APPS) $(DESTDIR)$(bindir) + + install -d $(DESTDIR)$(mandir)/man1 + install docs/man/*.1 $(DESTDIR)$(mandir)/man1 # --- Clean and Default --- -tags: $(wildcard */*.h */*.c) +tags: $(shell find include source -name '*.[ch]') ctags $^ all: all-nojs $(JSTARGETS) all-nojs: $(THIRD_LIBS) $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) -third: $(THIRD_LIBS) - clean: rm -rf $(OUT) nuke: rm -rf build/* $(GEN) -.PHONY: all clean nuke install +.PHONY: all clean nuke install third libs apps generate @@ -37,12 +37,12 @@ V8_ARCH ?= x64 ifeq "$(OS)" "Darwin" V8_LIBS = -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8_LIB_CHOICE)/ -lv8_base -lv8_snapshot -lstdc++ else -V8_LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -lstdc++ +V8_LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -ldl -lstdc++ endif -V8_PRESENT := 1 +V8_PRESENT := yes else -V8_PRESENT := 0 +V8_PRESENT := no endif # --- FreeType 2 --- diff --git a/include/mupdf/image.h b/include/mupdf/img.h index 4c10b0d3..4c10b0d3 100644 --- a/include/mupdf/image.h +++ b/include/mupdf/img.h diff --git a/platform/win32/generate.bat b/platform/win32/generate.bat index c10a9d8f..681eaf66 100644 --- a/platform/win32/generate.bat +++ b/platform/win32/generate.bat @@ -1,37 +1,31 @@ @echo off -if not exist scripts/fontdump.c cd .. +if not exist scripts/fontdump.c cd ../.. +if not exist scripts/fontdump.c goto usage if not exist generated mkdir generated -cl /nologo -Iinclude scripts/fontdump.c -cl /nologo -Iinclude scripts/cmapdump.c -cl /nologo -Iinclude scripts/cquote.c -cl /nologo -Iinclude scripts/bin2hex.c +cl /nologo -Iinclude scripts/fontdump.c setargv.obj +cl /nologo -Iinclude scripts/cmapdump.c setargv.obj +cl /nologo -Iinclude scripts/cquote.c setargv.obj +cl /nologo -Iinclude scripts/bin2hex.c setargv.obj if not exist fontdump.exe goto usage if not exist cmapdump.exe goto usage if not exist cquote.exe goto usage if not exist bin2hex.exe goto usage -if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h fonts/Dingbats.cff fonts/NimbusMonL-Bold.cff fonts/NimbusMonL-BoldObli.cff fonts/NimbusMonL-Regu.cff fonts/NimbusMonL-ReguObli.cff fonts/NimbusRomNo9L-Medi.cff fonts/NimbusRomNo9L-MediItal.cff fonts/NimbusRomNo9L-Regu.cff fonts/NimbusRomNo9L-ReguItal.cff fonts/NimbusSanL-Bold.cff fonts/NimbusSanL-BoldItal.cff fonts/NimbusSanL-Regu.cff fonts/NimbusSanL-ReguItal.cff fonts/StandardSymL.cff +if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h resources/fonts/*.cff +if not exist generated/gen_font_droid.h fontdump.exe generated/gen_font_droid.h resources/fonts/droid/DroidSans.ttf resources/fonts/droid/DroidSansMono.ttf +if not exist generated/gen_font_cjk.h fontdump.exe generated/gen_font_cjk.h resources/fonts/droid/DroidSansFallback.ttf +if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h resources/fonts/droid/DroidSansFallbackFull.ttf -if not exist generated/gen_font_droid.h fontdump.exe generated/gen_font_droid.h fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf +if not exist generated/gen_cmap_cns.h cmapdump.exe generated/gen_cmap_cns.h resources\cmaps\cns\* +if not exist generated/gen_cmap_gb.h cmapdump.exe generated/gen_cmap_gb.h resources\cmaps\gb\* +if not exist generated/gen_cmap_japan.h cmapdump.exe generated/gen_cmap_japan.h resources\cmaps\japan\* +if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h resources\cmaps\korea\* -if not exist generated/gen_font_cjk.h fontdump.exe generated/gen_font_cjk.h fonts/droid/DroidSansFallback.ttf - -if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h fonts/droid/DroidSansFallbackFull.ttf - -if not exist generated/gen_cmap_cns.h cmapdump.exe generated/gen_cmap_cns.h cmaps/cns/Adobe-CNS1-UCS2 cmaps/cns/Adobe-CNS1-0 cmaps/cns/Adobe-CNS1-1 cmaps/cns/Adobe-CNS1-2 cmaps/cns/Adobe-CNS1-3 cmaps/cns/Adobe-CNS1-4 cmaps/cns/Adobe-CNS1-5 cmaps/cns/Adobe-CNS1-6 cmaps/cns/B5-H cmaps/cns/B5-V cmaps/cns/B5pc-H cmaps/cns/B5pc-V cmaps/cns/CNS-EUC-H cmaps/cns/CNS-EUC-V cmaps/cns/CNS1-H cmaps/cns/CNS1-V cmaps/cns/CNS2-H cmaps/cns/CNS2-V cmaps/cns/ETen-B5-H cmaps/cns/ETen-B5-V cmaps/cns/ETenms-B5-H cmaps/cns/ETenms-B5-V cmaps/cns/ETHK-B5-H cmaps/cns/ETHK-B5-V cmaps/cns/HKdla-B5-H cmaps/cns/HKdla-B5-V cmaps/cns/HKdlb-B5-H cmaps/cns/HKdlb-B5-V cmaps/cns/HKgccs-B5-H cmaps/cns/HKgccs-B5-V cmaps/cns/HKm314-B5-H cmaps/cns/HKm314-B5-V cmaps/cns/HKm471-B5-H cmaps/cns/HKm471-B5-V cmaps/cns/HKscs-B5-H cmaps/cns/HKscs-B5-V cmaps/cns/UniCNS-UCS2-H cmaps/cns/UniCNS-UCS2-V cmaps/cns/UniCNS-UTF16-H cmaps/cns/UniCNS-UTF16-V - -if not exist generated/gen_cmap_gb.h cmapdump.exe generated/gen_cmap_gb.h cmaps/gb/Adobe-GB1-UCS2 cmaps/gb/Adobe-GB1-0 cmaps/gb/Adobe-GB1-1 cmaps/gb/Adobe-GB1-2 cmaps/gb/Adobe-GB1-3 cmaps/gb/Adobe-GB1-4 cmaps/gb/Adobe-GB1-5 cmaps/gb/GB-EUC-H cmaps/gb/GB-EUC-V cmaps/gb/GB-H cmaps/gb/GB-V cmaps/gb/GBK-EUC-H cmaps/gb/GBK-EUC-V cmaps/gb/GBK2K-H cmaps/gb/GBK2K-V cmaps/gb/GBKp-EUC-H cmaps/gb/GBKp-EUC-V cmaps/gb/GBpc-EUC-H cmaps/gb/GBpc-EUC-V cmaps/gb/GBT-EUC-H cmaps/gb/GBT-EUC-V cmaps/gb/GBT-H cmaps/gb/GBT-V cmaps/gb/GBTpc-EUC-H cmaps/gb/GBTpc-EUC-V cmaps/gb/UniGB-UCS2-H cmaps/gb/UniGB-UCS2-V cmaps/gb/UniGB-UTF16-H cmaps/gb/UniGB-UTF16-V - -if not exist generated/gen_cmap_japan.h cmapdump.exe generated/gen_cmap_japan.h cmaps/japan/Adobe-Japan1-UCS2 cmaps/japan/78-EUC-H cmaps/japan/78-EUC-V cmaps/japan/78-H cmaps/japan/78-RKSJ-H cmaps/japan/78-RKSJ-V cmaps/japan/78-V cmaps/japan/78ms-RKSJ-H cmaps/japan/78ms-RKSJ-V cmaps/japan/83pv-RKSJ-H cmaps/japan/90ms-RKSJ-H cmaps/japan/90ms-RKSJ-V cmaps/japan/90msp-RKSJ-H cmaps/japan/90msp-RKSJ-V cmaps/japan/90pv-RKSJ-H cmaps/japan/90pv-RKSJ-V cmaps/japan/Add-H cmaps/japan/Add-RKSJ-H cmaps/japan/Add-RKSJ-V cmaps/japan/Add-V cmaps/japan/Adobe-Japan1-0 cmaps/japan/Adobe-Japan1-1 cmaps/japan/Adobe-Japan1-2 cmaps/japan/Adobe-Japan1-3 cmaps/japan/Adobe-Japan1-4 cmaps/japan/Adobe-Japan1-5 cmaps/japan/Adobe-Japan1-6 cmaps/japan/EUC-H cmaps/japan/EUC-V cmaps/japan/Ext-H cmaps/japan/Ext-RKSJ-H cmaps/japan/Ext-RKSJ-V cmaps/japan/Ext-V cmaps/japan/H cmaps/japan/Hankaku cmaps/japan/Hiragana cmaps/japan/Katakana cmaps/japan/NWP-H cmaps/japan/NWP-V cmaps/japan/RKSJ-H cmaps/japan/RKSJ-V cmaps/japan/Roman cmaps/japan/UniJIS-UCS2-H cmaps/japan/UniJIS-UCS2-HW-H cmaps/japan/UniJIS-UCS2-HW-V cmaps/japan/UniJIS-UCS2-V cmaps/japan/UniJISPro-UCS2-HW-V cmaps/japan/UniJISPro-UCS2-V cmaps/japan/V cmaps/japan/WP-Symbol cmaps/japan/Adobe-Japan2-0 cmaps/japan/Hojo-EUC-H cmaps/japan/Hojo-EUC-V cmaps/japan/Hojo-H cmaps/japan/Hojo-V cmaps/japan/UniHojo-UCS2-H cmaps/japan/UniHojo-UCS2-V cmaps/japan/UniHojo-UTF16-H cmaps/japan/UniHojo-UTF16-V cmaps/japan/UniJIS-UTF16-H cmaps/japan/UniJIS-UTF16-V - -if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h cmaps/korea/Adobe-Korea1-UCS2 cmaps/korea/Adobe-Korea1-0 cmaps/korea/Adobe-Korea1-1 cmaps/korea/Adobe-Korea1-2 cmaps/korea/KSC-EUC-H cmaps/korea/KSC-EUC-V cmaps/korea/KSC-H cmaps/korea/KSC-Johab-H cmaps/korea/KSC-Johab-V cmaps/korea/KSC-V cmaps/korea/KSCms-UHC-H cmaps/korea/KSCms-UHC-HW-H cmaps/korea/KSCms-UHC-HW-V cmaps/korea/KSCms-UHC-V cmaps/korea/KSCpc-EUC-H cmaps/korea/KSCpc-EUC-V cmaps/korea/UniKS-UCS2-H cmaps/korea/UniKS-UCS2-V cmaps/korea/UniKS-UTF16-H cmaps/korea/UniKS-UTF16-V - -if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h pdf/pdf_util.js - -if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h certs/AdobeCA.p7c +if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h resources/certs/AdobeCA.p7c +if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h source/pdf/js/pdf-util.js del cmapdump.obj fontdump.obj cquote.obj bin2hex.obj cmapdump.exe fontdump.exe cquote.exe bin2hex.exe diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj index 4fef3694..109031a7 100644 --- a/platform/win32/generated.vcproj +++ b/platform/win32/generated.vcproj @@ -43,8 +43,8 @@ <Tool Name="VCNMakeTool" BuildCommandLine="generate.bat" - ReBuildCommandLine="del /q ..\generated && generate.bat" - CleanCommandLine="del /q ..\generated" + ReBuildCommandLine="del /q ..\..\generated && generate.bat" + CleanCommandLine="del /q ..\..\generated" Output="generated\cmap_cns.h" PreprocessorDefinitions="WIN32;NDEBUG" IncludeSearchPath="" @@ -63,8 +63,8 @@ <Tool Name="VCNMakeTool" BuildCommandLine="generate.bat" - ReBuildCommandLine="del /q ..\generated && generate.bat" - CleanCommandLine="del /q ..\generated" + ReBuildCommandLine="del /q ..\..\generated && generate.bat" + CleanCommandLine="del /q ..\..\generated" Output="generated\cmap_cns.h" PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" @@ -79,751 +79,73 @@ </References> <Files> <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\scripts\bin2hex.c" - > - </File> - <File - RelativePath="..\scripts\cmapdump.c" - > - </File> - <File - RelativePath="..\scripts\cquote.c" - > - </File> - <File - RelativePath="..\scripts\fontdump.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + Name="scripts" > <File - RelativePath="..\scripts\jconfig.h" + RelativePath="..\..\scripts\bin2hex.c" > </File> <File - RelativePath="..\scripts\opj_config.h" + RelativePath="..\..\scripts\cmapdump.c" > </File> <File - RelativePath="..\scripts\slimftmodules.h" + RelativePath="..\..\scripts\cquote.c" > </File> <File - RelativePath="..\scripts\slimftoptions.h" + RelativePath="..\..\scripts\fontdump.c" > </File> </Filter> <Filter - Name="CMAPs" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - <Filter - Name="cns" - > - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-0" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-1" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-2" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-3" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-4" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-5" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-6" - > - </File> - <File - RelativePath="..\cmaps\cns\Adobe-CNS1-UCS2" - > - </File> - <File - RelativePath="..\cmaps\cns\B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\B5pc-H" - > - </File> - <File - RelativePath="..\cmaps\cns\B5pc-V" - > - </File> - <File - RelativePath="..\cmaps\cns\CNS-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\cns\CNS-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\cns\CNS1-H" - > - </File> - <File - RelativePath="..\cmaps\cns\CNS1-V" - > - </File> - <File - RelativePath="..\cmaps\cns\CNS2-H" - > - </File> - <File - RelativePath="..\cmaps\cns\CNS2-V" - > - </File> - <File - RelativePath="..\cmaps\cns\ETen-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\ETen-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\ETenms-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\ETenms-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\ETHK-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\ETHK-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\HKdla-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\HKdla-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\HKdlb-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\HKdlb-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\HKgccs-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\HKgccs-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\HKm314-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\HKm314-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\HKm471-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\HKm471-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\HKscs-B5-H" - > - </File> - <File - RelativePath="..\cmaps\cns\HKscs-B5-V" - > - </File> - <File - RelativePath="..\cmaps\cns\UniCNS-UCS2-H" - > - </File> - <File - RelativePath="..\cmaps\cns\UniCNS-UCS2-V" - > - </File> - <File - RelativePath="..\cmaps\cns\UniCNS-UTF16-H" - > - </File> - <File - RelativePath="..\cmaps\cns\UniCNS-UTF16-V" - > - </File> - </Filter> - <Filter - Name="gb" - > - <File - RelativePath="..\cmaps\gb\Adobe-GB1-0" - > - </File> - <File - RelativePath="..\cmaps\gb\Adobe-GB1-1" - > - </File> - <File - RelativePath="..\cmaps\gb\Adobe-GB1-2" - > - </File> - <File - RelativePath="..\cmaps\gb\Adobe-GB1-3" - > - </File> - <File - RelativePath="..\cmaps\gb\Adobe-GB1-4" - > - </File> - <File - RelativePath="..\cmaps\gb\Adobe-GB1-5" - > - </File> - <File - RelativePath="..\cmaps\gb\Adobe-GB1-UCS2" - > - </File> - <File - RelativePath="..\cmaps\gb\GB-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GB-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GB-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GB-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBK-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBK-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBK2K-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBK2K-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBKp-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBKp-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBpc-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBpc-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBT-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBT-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBT-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBT-V" - > - </File> - <File - RelativePath="..\cmaps\gb\GBTpc-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\gb\GBTpc-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\gb\UniGB-UCS2-H" - > - </File> - <File - RelativePath="..\cmaps\gb\UniGB-UCS2-V" - > - </File> - <File - RelativePath="..\cmaps\gb\UniGB-UTF16-H" - > - </File> - <File - RelativePath="..\cmaps\gb\UniGB-UTF16-V" - > - </File> - </Filter> - <Filter - Name="japan" - > - <File - RelativePath="..\cmaps\japan\78-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\japan\78-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\japan\78-H" - > - </File> - <File - RelativePath="..\cmaps\japan\78-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\78-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\78-V" - > - </File> - <File - RelativePath="..\cmaps\japan\78ms-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\78ms-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\83pv-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\90ms-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\90ms-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\90msp-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\90msp-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\90pv-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\90pv-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Add-H" - > - </File> - <File - RelativePath="..\cmaps\japan\Add-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\Add-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Add-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-0" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-1" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-2" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-3" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-4" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-5" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-6" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan1-UCS2" - > - </File> - <File - RelativePath="..\cmaps\japan\Adobe-Japan2-0" - > - </File> - <File - RelativePath="..\cmaps\japan\EUC-H" - > - </File> - <File - RelativePath="..\cmaps\japan\EUC-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Ext-H" - > - </File> - <File - RelativePath="..\cmaps\japan\Ext-RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\Ext-RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Ext-V" - > - </File> - <File - RelativePath="..\cmaps\japan\H" - > - </File> - <File - RelativePath="..\cmaps\japan\Hankaku" - > - </File> - <File - RelativePath="..\cmaps\japan\Hiragana" - > - </File> - <File - RelativePath="..\cmaps\japan\Hojo-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\japan\Hojo-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Hojo-H" - > - </File> - <File - RelativePath="..\cmaps\japan\Hojo-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Katakana" - > - </File> - <File - RelativePath="..\cmaps\japan\NWP-H" - > - </File> - <File - RelativePath="..\cmaps\japan\NWP-V" - > - </File> - <File - RelativePath="..\cmaps\japan\RKSJ-H" - > - </File> - <File - RelativePath="..\cmaps\japan\RKSJ-V" - > - </File> - <File - RelativePath="..\cmaps\japan\Roman" - > - </File> - <File - RelativePath="..\cmaps\japan\UniHojo-UCS2-H" - > - </File> - <File - RelativePath="..\cmaps\japan\UniHojo-UCS2-V" - > - </File> - <File - RelativePath="..\cmaps\japan\UniHojo-UTF16-H" - > - </File> - <File - RelativePath="..\cmaps\japan\UniHojo-UTF16-V" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJIS-UCS2-H" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJIS-UCS2-HW-H" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJIS-UCS2-HW-V" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJIS-UCS2-V" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJIS-UTF16-H" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJIS-UTF16-V" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJISPro-UCS2-HW-V" - > - </File> - <File - RelativePath="..\cmaps\japan\UniJISPro-UCS2-V" - > - </File> - <File - RelativePath="..\cmaps\japan\V" - > - </File> - <File - RelativePath="..\cmaps\japan\WP-Symbol" - > - </File> - </Filter> - <Filter - Name="korea" - > - <File - RelativePath="..\cmaps\korea\Adobe-Korea1-0" - > - </File> - <File - RelativePath="..\cmaps\korea\Adobe-Korea1-1" - > - </File> - <File - RelativePath="..\cmaps\korea\Adobe-Korea1-2" - > - </File> - <File - RelativePath="..\cmaps\korea\Adobe-Korea1-UCS2" - > - </File> - <File - RelativePath="..\cmaps\korea\KSC-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\korea\KSC-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\korea\KSC-H" - > - </File> - <File - RelativePath="..\cmaps\korea\KSC-Johab-H" - > - </File> - <File - RelativePath="..\cmaps\korea\KSC-Johab-V" - > - </File> - <File - RelativePath="..\cmaps\korea\KSC-V" - > - </File> - <File - RelativePath="..\cmaps\korea\KSCms-UHC-H" - > - </File> - <File - RelativePath="..\cmaps\korea\KSCms-UHC-HW-H" - > - </File> - <File - RelativePath="..\cmaps\korea\KSCms-UHC-HW-V" - > - </File> - <File - RelativePath="..\cmaps\korea\KSCms-UHC-V" - > - </File> - <File - RelativePath="..\cmaps\korea\KSCpc-EUC-H" - > - </File> - <File - RelativePath="..\cmaps\korea\KSCpc-EUC-V" - > - </File> - <File - RelativePath="..\cmaps\korea\UniKS-UCS2-H" - > - </File> - <File - RelativePath="..\cmaps\korea\UniKS-UCS2-V" - > - </File> - <File - RelativePath="..\cmaps\korea\UniKS-UTF16-H" - > - </File> - <File - RelativePath="..\cmaps\korea\UniKS-UTF16-V" - > - </File> - </Filter> - </Filter> - <Filter - Name="Fonts" + Name="generated" > <File - RelativePath="..\fonts\Dingbats.cff" - > - </File> - <File - RelativePath="..\fonts\NimbusMonL-Bold.cff" - > - </File> - <File - RelativePath="..\fonts\NimbusMonL-BoldObli.cff" - > - </File> - <File - RelativePath="..\fonts\NimbusMonL-Regu.cff" + RelativePath="..\..\generated\gen_adobe_ca.h" > </File> <File - RelativePath="..\fonts\NimbusMonL-ReguObli.cff" + RelativePath="..\..\generated\gen_cmap_cns.h" > </File> <File - RelativePath="..\fonts\NimbusRomNo9L-Medi.cff" + RelativePath="..\..\generated\gen_cmap_gb.h" > </File> <File - RelativePath="..\fonts\NimbusRomNo9L-MediItal.cff" + RelativePath="..\..\generated\gen_cmap_japan.h" > </File> <File - RelativePath="..\fonts\NimbusRomNo9L-Regu.cff" + RelativePath="..\..\generated\gen_cmap_korea.h" > </File> <File - RelativePath="..\fonts\NimbusRomNo9L-ReguItal.cff" + RelativePath="..\..\generated\gen_font_base14.h" > </File> <File - RelativePath="..\fonts\NimbusSanL-Bold.cff" + RelativePath="..\..\generated\gen_font_cjk.h" > </File> <File - RelativePath="..\fonts\NimbusSanL-BoldItal.cff" + RelativePath="..\..\generated\gen_font_cjk_full.h" > </File> <File - RelativePath="..\fonts\NimbusSanL-Regu.cff" + RelativePath="..\..\generated\gen_font_droid.h" > </File> <File - RelativePath="..\fonts\NimbusSanL-ReguItal.cff" + RelativePath="..\..\generated\gen_js_util.h" > </File> - <File - RelativePath="..\fonts\StandardSymL.cff" - > - </File> - <Filter - Name="droid" - > - <File - RelativePath="..\fonts\droid\DroidSans.ttf" - > - </File> - <File - RelativePath="..\fonts\droid\DroidSansFallback.ttf" - > - </File> - <File - RelativePath="..\fonts\droid\DroidSansMono.ttf" - > - </File> - <File - RelativePath="..\fonts\droid\NOTICE" - > - </File> - </Filter> </Filter> + <File + RelativePath=".\generate.bat" + > + </File> </Files> <Globals> </Globals> diff --git a/platform/win32/libmupdf-nov8.vcproj b/platform/win32/libmupdf-js-none.vcproj index 108b82a5..00ed55de 100644 --- a/platform/win32/libmupdf-nov8.vcproj +++ b/platform/win32/libmupdf-js-none.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="libmupdf-nov8" + Name="libmupdf-js-none" ProjectGUID="{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}" RootNamespace="mupdf" > @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\thirdparty\jbig2dec;"..\thirdparty\jpeg";"..\thirdparty\openjpeg\libopenjpeg";"..\thirdparty\zlib";"..\thirdparty\freetype\include";"..\thirdparty\v8-3.9\include"" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -87,7 +87,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="" CommandLine="" /> <Tool @@ -106,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;"..\thirdparty\v8-3.9\include"" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -166,7 +165,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;"..\thirdparty\v8-3.9\include"" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -202,18 +201,139 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="DebugOpenssl|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + PreprocessorDefinitions="DEBUG=1" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="ReleaseOpenssl|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> <Files> - <Filter - Name="pdf" + <File + RelativePath="..\..\source\pdf\js\pdf-js-none.c" > - <File - RelativePath="..\pdf\pdf_js_none.c" - > - </File> - </Filter> + </File> </Files> <Globals> </Globals> diff --git a/platform/win32/libmupdf-js-v8.vcproj b/platform/win32/libmupdf-js-v8.vcproj new file mode 100644 index 00000000..7af2d6f9 --- /dev/null +++ b/platform/win32/libmupdf-js-v8.vcproj @@ -0,0 +1,352 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libmupdf-js-v8" + ProjectGUID="{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}" + RootNamespace="mupdf" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + PreprocessorDefinitions="DEBUG=1" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Memento|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + PreprocessorDefinitions="MEMENTO=1;DEBUG=1" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="DebugOpenssl|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + PreprocessorDefinitions="DEBUG=1" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalLibraryDirectories="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="ReleaseOpenssl|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\v8-3.9\include" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\source\pdf\js\pdf-js.c" + > + </File> + <File + RelativePath="..\..\source\pdf\js\pdf-jsimp-cpp.c" + > + </File> + <File + RelativePath="..\..\source\pdf\js\pdf-jsimp-cpp.h" + > + </File> + <File + RelativePath="..\..\source\pdf\js\pdf-jsimp-v8.cpp" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/platform/win32/libmupdf-v8.vcproj b/platform/win32/libmupdf-v8.vcproj deleted file mode 100644 index 36b6ccd8..00000000 --- a/platform/win32/libmupdf-v8.vcproj +++ /dev/null @@ -1,232 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="libmupdf-v8" - ProjectGUID="{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}" - RootNamespace="mupdf" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\thirdparty\jbig2dec;"..\thirdparty\jpeg";"..\thirdparty\openjpeg\libopenjpeg";"..\thirdparty\zlib";"..\thirdparty\freetype\include";"..\thirdparty\v8-3.9\include"" - PreprocessorDefinitions="DEBUG=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - AdditionalLibraryDirectories="" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - Description="" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;"..\thirdparty\v8-3.9\include"" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Memento|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;"..\thirdparty\v8-3.9\include"" - PreprocessorDefinitions="MEMENTO=1;DEBUG=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="pdf" - > - <File - RelativePath="..\pdf\pdf_js.c" - > - </File> - <File - RelativePath="..\pdf\pdf_jsimp_cpp.c" - > - </File> - <File - RelativePath="..\pdf\pdf_jsimp_cpp.h" - > - </File> - <File - RelativePath="..\pdf\pdf_jsimp_v8.cpp" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index 9bf997ec..ac9e3707 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\include;..\ucdn;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\include;..\ucdn;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -165,7 +165,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\include;..\ucdn;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -201,800 +201,889 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="DebugOpenssl|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" + PreprocessorDefinitions="DEBUG=1;HAVE_OPENSSL" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="ReleaseOpenssl|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Generate CMap and Font source files" + CommandLine="generate.bat" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> <Files> <Filter - Name="pdf" + Name="cbz" > <File - RelativePath="..\pdf\data_encodings.h" + RelativePath="..\..\source\cbz\mucbz.c" > </File> + </Filter> + <Filter + Name="xps" + > <File - RelativePath="..\pdf\data_glyphlist.h" + RelativePath="..\..\source\xps\xps-common.c" > </File> <File - RelativePath="..\pdf\mupdf-internal.h" + RelativePath="..\..\source\xps\xps-doc.c" > </File> <File - RelativePath="..\pdf\mupdf.h" + RelativePath="..\..\source\xps\xps-glyphs.c" > </File> <File - RelativePath="..\pdf\pdf_annot.c" + RelativePath="..\..\source\xps\xps-gradient.c" > </File> <File - RelativePath="..\pdf\pdf_cmap.c" + RelativePath="..\..\source\xps\xps-image.c" > </File> <File - RelativePath="..\pdf\pdf_cmap_load.c" + RelativePath="..\..\source\xps\xps-outline.c" > </File> <File - RelativePath="..\pdf\pdf_cmap_parse.c" + RelativePath="..\..\source\xps\xps-path.c" > </File> <File - RelativePath="..\pdf\pdf_cmap_table.c" + RelativePath="..\..\source\xps\xps-resource.c" > </File> <File - RelativePath="..\pdf\pdf_colorspace.c" + RelativePath="..\..\source\xps\xps-tile.c" > </File> <File - RelativePath="..\pdf\pdf_crypt.c" + RelativePath="..\..\source\xps\xps-util.c" > </File> <File - RelativePath="..\pdf\pdf_device.c" + RelativePath="..\..\source\xps\xps-zip.c" > </File> + </Filter> + <Filter + Name="fitz" + > <File - RelativePath="..\pdf\pdf_encoding.c" + RelativePath="..\..\source\fitz\bbox-device.c" > </File> <File - RelativePath="..\pdf\pdf_event.c" + RelativePath="..\..\source\fitz\bitmap.c" > </File> <File - RelativePath="..\pdf\pdf_field.c" + RelativePath="..\..\source\fitz\buffer.c" > </File> <File - RelativePath="..\pdf\pdf_font.c" + RelativePath="..\..\source\fitz\colorspace.c" > </File> <File - RelativePath="..\pdf\pdf_fontfile.c" + RelativePath="..\..\source\fitz\compressed-buffer.c" > </File> <File - RelativePath="..\pdf\pdf_form.c" + RelativePath="..\..\source\fitz\context.c" > </File> <File - RelativePath="..\pdf\pdf_function.c" + RelativePath="..\..\source\fitz\crypt-aes.c" > </File> <File - RelativePath="..\pdf\pdf_image.c" + RelativePath="..\..\source\fitz\crypt-arc4.c" > </File> <File - RelativePath="..\pdf\pdf_interpret.c" + RelativePath="..\..\source\fitz\crypt-md5.c" > </File> <File - RelativePath="..\pdf\pdf_lex.c" + RelativePath="..\..\source\fitz\crypt-sha2.c" > </File> <File - RelativePath="..\pdf\pdf_metrics.c" + RelativePath="..\..\source\fitz\device.c" > </File> <File - RelativePath="..\pdf\pdf_nametree.c" + RelativePath="..\..\source\fitz\document.c" > </File> <File - RelativePath="..\pdf\pdf_object.c" + RelativePath="..\..\source\fitz\draw-affine.c" > </File> <File - RelativePath="..\pdf\pdf_outline.c" + RelativePath="..\..\source\fitz\draw-blend.c" > </File> <File - RelativePath="..\pdf\pdf_page.c" + RelativePath="..\..\source\fitz\draw-device.c" > </File> <File - RelativePath="..\pdf\pdf_parse.c" + RelativePath="..\..\source\fitz\draw-edge.c" > </File> <File - RelativePath="..\pdf\pdf_pattern.c" + RelativePath="..\..\source\fitz\draw-glyph.c" > </File> <File - RelativePath="..\pdf\pdf_repair.c" + RelativePath="..\..\source\fitz\draw-imp.h" > </File> <File - RelativePath="..\pdf\pdf_shade.c" + RelativePath="..\..\source\fitz\draw-mesh.c" > </File> <File - RelativePath="..\pdf\pdf_store.c" + RelativePath="..\..\source\fitz\draw-paint.c" > </File> <File - RelativePath="..\pdf\pdf_stream.c" + RelativePath="..\..\source\fitz\draw-path.c" > </File> <File - RelativePath="..\pdf\pdf_type3.c" + RelativePath="..\..\source\fitz\draw-scale-simple.c" > </File> <File - RelativePath="..\pdf\pdf_unicode.c" + RelativePath="..\..\source\fitz\draw-unpack.c" > </File> <File - RelativePath="..\pdf\pdf_write.c" + RelativePath="..\..\source\fitz\error.c" > </File> <File - RelativePath="..\pdf\pdf_xobject.c" + RelativePath="..\..\source\fitz\filter-basic.c" > </File> <File - RelativePath="..\pdf\pdf_xref.c" + RelativePath="..\..\source\fitz\filter-dct.c" > </File> <File - RelativePath="..\pdf\pdf_xref_aux.c" + RelativePath="..\..\source\fitz\filter-fax.c" > </File> - </Filter> - <Filter - Name="fitz" - > <File - RelativePath="..\fitz\base_context.c" + RelativePath="..\..\source\fitz\filter-flate.c" > </File> <File - RelativePath="..\fitz\base_error.c" + RelativePath="..\..\source\fitz\filter-jbig2.c" > </File> <File - RelativePath="..\fitz\base_geometry.c" + RelativePath="..\..\source\fitz\filter-lzw.c" > </File> <File - RelativePath="..\fitz\base_getopt.c" + RelativePath="..\..\source\fitz\filter-predict.c" > </File> <File - RelativePath="..\fitz\base_hash.c" + RelativePath="..\..\source\fitz\font.c" > </File> <File - RelativePath="..\fitz\base_memory.c" + RelativePath="..\..\source\fitz\function.c" > </File> <File - RelativePath="..\fitz\base_string.c" + RelativePath="..\..\source\fitz\geometry.c" > </File> <File - RelativePath="..\fitz\base_time.c" + RelativePath="..\..\source\fitz\getopt.c" > </File> <File - RelativePath="..\fitz\base_trans.c" + RelativePath="..\..\source\fitz\halftone.c" > </File> <File - RelativePath="..\fitz\base_xml.c" + RelativePath="..\..\source\fitz\hash.c" > </File> <File - RelativePath="..\fitz\crypt_aes.c" + RelativePath="..\..\source\fitz\image.c" > </File> <File - RelativePath="..\fitz\crypt_arc4.c" + RelativePath="..\..\source\fitz\link.c" > </File> <File - RelativePath="..\fitz\crypt_md5.c" + RelativePath="..\..\source\fitz\list-device.c" > </File> <File - RelativePath="..\fitz\crypt_sha2.c" + RelativePath="..\..\source\fitz\load-jpeg.c" > </File> <File - RelativePath="..\fitz\dev_bbox.c" + RelativePath="..\..\source\fitz\load-jpx.c" > </File> <File - RelativePath="..\fitz\dev_list.c" + RelativePath="..\..\source\fitz\load-png.c" > </File> <File - RelativePath="..\fitz\dev_null.c" + RelativePath="..\..\source\fitz\load-tiff.c" > </File> <File - RelativePath="..\fitz\dev_svg.c" + RelativePath="..\..\source\fitz\memento.c" > </File> <File - RelativePath="..\fitz\dev_trace.c" + RelativePath="..\..\source\fitz\memory.c" > </File> <File - RelativePath="..\fitz\doc_document.c" + RelativePath="..\..\source\fitz\outline.c" > </File> <File - RelativePath="..\fitz\doc_link.c" + RelativePath="..\..\source\fitz\output-pcl.c" > </File> <File - RelativePath="..\fitz\doc_outline.c" + RelativePath="..\..\source\fitz\output-pwg.c" > </File> <File - RelativePath="..\fitz\filt_basic.c" + RelativePath="..\..\source\fitz\output.c" > </File> <File - RelativePath="..\fitz\filt_dctd.c" + RelativePath="..\..\source\fitz\path.c" > </File> <File - RelativePath="..\fitz\filt_faxd.c" + RelativePath="..\..\source\fitz\pixmap.c" > </File> <File - RelativePath="..\fitz\filt_flate.c" + RelativePath="..\..\source\fitz\shade.c" > </File> <File - RelativePath="..\fitz\filt_jbig2d.c" + RelativePath="..\..\source\fitz\stext-device.c" > </File> <File - RelativePath="..\fitz\filt_lzwd.c" + RelativePath="..\..\source\fitz\stext-output.c" > </File> <File - RelativePath="..\fitz\filt_predict.c" + RelativePath="..\..\source\fitz\stext-paragraph.c" > </File> <File - RelativePath="..\fitz\fitz-internal.h" + RelativePath="..\..\source\fitz\stext-search.c" > </File> <File - RelativePath="..\fitz\fitz.h" + RelativePath="..\..\source\fitz\store.c" > </File> <File - RelativePath="..\fitz\image_jpeg.c" + RelativePath="..\..\source\fitz\stream-open.c" > </File> <File - RelativePath="..\fitz\image_jpx.c" + RelativePath="..\..\source\fitz\stream-read.c" > </File> <File - RelativePath="..\fitz\image_md5.c" + RelativePath="..\..\source\fitz\string.c" > </File> <File - RelativePath="..\fitz\image_png.c" + RelativePath="..\..\source\fitz\svg-device.c" > </File> <File - RelativePath="..\fitz\image_tiff.c" + RelativePath="..\..\source\fitz\text.c" > </File> <File - RelativePath="..\fitz\memento.c" + RelativePath="..\..\source\fitz\time.c" > </File> <File - RelativePath="..\fitz\memento.h" + RelativePath="..\..\source\fitz\trace-device.c" > </File> <File - RelativePath="..\fitz\res_bitmap.c" + RelativePath="..\..\source\fitz\transition.c" > </File> <File - RelativePath="..\fitz\res_colorspace.c" + RelativePath="..\..\source\fitz\ucdn.c" > </File> <File - RelativePath="..\fitz\res_font.c" + RelativePath="..\..\source\fitz\ucdn.h" > </File> <File - RelativePath="..\fitz\res_func.c" + RelativePath="..\..\source\fitz\unicodedata_db.h" > </File> <File - RelativePath="..\fitz\res_halftone.c" + RelativePath="..\..\source\fitz\xml.c" > </File> + </Filter> + <Filter + Name="img" + > <File - RelativePath="..\fitz\res_image.c" + RelativePath="..\..\source\img\muimage.c" > </File> + </Filter> + <Filter + Name="pdf" + > <File - RelativePath="..\fitz\res_path.c" + RelativePath="..\..\source\pdf\pdf-annot.c" > </File> <File - RelativePath="..\fitz\res_pcl.c" + RelativePath="..\..\source\pdf\pdf-cmap-load.c" > </File> <File - RelativePath="..\fitz\res_pixmap.c" + RelativePath="..\..\source\pdf\pdf-cmap-parse.c" > </File> <File - RelativePath="..\fitz\res_pwg.c" + RelativePath="..\..\source\pdf\pdf-cmap-table.c" > </File> <File - RelativePath="..\fitz\res_shade.c" + RelativePath="..\..\source\pdf\pdf-cmap.c" > </File> <File - RelativePath="..\fitz\res_store.c" + RelativePath="..\..\source\pdf\pdf-colorspace.c" > </File> <File - RelativePath="..\fitz\res_text.c" + RelativePath="..\..\source\pdf\pdf-crypt.c" > </File> <File - RelativePath="..\fitz\stm_buffer.c" + RelativePath="..\..\source\pdf\pdf-device.c" > </File> <File - RelativePath="..\fitz\stm_comp_buf.c" + RelativePath="..\..\source\pdf\pdf-encoding.c" > </File> <File - RelativePath="..\fitz\stm_open.c" + RelativePath="..\..\source\pdf\pdf-encodings.h" > </File> <File - RelativePath="..\fitz\stm_output.c" + RelativePath="..\..\source\pdf\pdf-event.c" > </File> <File - RelativePath="..\fitz\stm_read.c" + RelativePath="..\..\source\pdf\pdf-field.c" > </File> <File - RelativePath="..\fitz\text_extract.c" + RelativePath="..\..\source\pdf\pdf-font.c" > </File> <File - RelativePath="..\fitz\text_output.c" + RelativePath="..\..\source\pdf\pdf-fontfile.c" > </File> <File - RelativePath="..\fitz\text_paragraph.c" + RelativePath="..\..\source\pdf\pdf-form.c" > </File> <File - RelativePath="..\fitz\text_search.c" + RelativePath="..\..\source\pdf\pdf-function.c" > </File> - </Filter> - <Filter - Name="draw" - > <File - RelativePath="..\draw\draw_affine.c" + RelativePath="..\..\source\pdf\pdf-glyphlist.h" > </File> <File - RelativePath="..\draw\draw_blend.c" + RelativePath="..\..\source\pdf\pdf-image.c" > </File> <File - RelativePath="..\draw\draw_device.c" + RelativePath="..\..\source\pdf\pdf-interpret.c" > </File> <File - RelativePath="..\draw\draw_edge.c" + RelativePath="..\..\source\pdf\pdf-lex.c" > </File> <File - RelativePath="..\draw\draw_glyph.c" + RelativePath="..\..\source\pdf\pdf-metrics.c" > </File> <File - RelativePath="..\draw\draw_mesh.c" + RelativePath="..\..\source\pdf\pdf-nametree.c" > </File> <File - RelativePath="..\draw\draw_paint.c" + RelativePath="..\..\source\pdf\pdf-object.c" > </File> <File - RelativePath="..\draw\draw_path.c" + RelativePath="..\..\source\pdf\pdf-outline.c" > </File> <File - RelativePath="..\draw\draw_simple_scale.c" + RelativePath="..\..\source\pdf\pdf-page.c" > </File> <File - RelativePath="..\draw\draw_unpack.c" + RelativePath="..\..\source\pdf\pdf-parse.c" > </File> - </Filter> - <Filter - Name="ucdn" - > <File - RelativePath="..\ucdn\ucdn.c" + RelativePath="..\..\source\pdf\pdf-pattern.c" > </File> - </Filter> - <Filter - Name="xps" - > <File - RelativePath="..\xps\muxps-internal.h" + RelativePath="..\..\source\pdf\pdf-pkcs7.c" > </File> <File - RelativePath="..\xps\muxps.h" + RelativePath="..\..\source\pdf\pdf-repair.c" > </File> <File - RelativePath="..\xps\xps_common.c" + RelativePath="..\..\source\pdf\pdf-shade.c" > </File> <File - RelativePath="..\xps\xps_doc.c" + RelativePath="..\..\source\pdf\pdf-store.c" > </File> <File - RelativePath="..\xps\xps_glyphs.c" + RelativePath="..\..\source\pdf\pdf-stream.c" > </File> <File - RelativePath="..\xps\xps_gradient.c" + RelativePath="..\..\source\pdf\pdf-type3.c" > </File> <File - RelativePath="..\xps\xps_image.c" + RelativePath="..\..\source\pdf\pdf-unicode.c" > </File> <File - RelativePath="..\xps\xps_outline.c" + RelativePath="..\..\source\pdf\pdf-write.c" > </File> <File - RelativePath="..\xps\xps_path.c" + RelativePath="..\..\source\pdf\pdf-xobject.c" > </File> <File - RelativePath="..\xps\xps_resource.c" + RelativePath="..\..\source\pdf\pdf-xref-aux.c" > </File> <File - RelativePath="..\xps\xps_tile.c" + RelativePath="..\..\source\pdf\pdf-xref.c" > </File> + </Filter> + <Filter + Name="!include" + > <File - RelativePath="..\xps\xps_util.c" + RelativePath="..\..\include\mupdf\cbz.h" > </File> <File - RelativePath="..\xps\xps_zip.c" + RelativePath="..\..\include\mupdf\fitz.h" > </File> - </Filter> - <Filter - Name="cbz" - > <File - RelativePath="..\cbz\mucbz.c" + RelativePath="..\..\include\mupdf\img.h" > </File> <File - RelativePath="..\cbz\mucbz.h" + RelativePath="..\..\include\mupdf\memento.h" > </File> - </Filter> - <Filter - Name="image" - > <File - RelativePath="..\image\muimage.c" + RelativePath="..\..\include\mupdf\pdf.h" > </File> <File - RelativePath="..\image\muimage.h" + RelativePath="..\..\include\mupdf\xps.h" > </File> - </Filter> - <Filter - Name="api" - > <Filter - Name="mupdf" - > - <File - RelativePath="..\include\mupdf\cbz.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz.h" - > - </File> - <File - RelativePath="..\include\mupdf\image.h" - > - </File> - <File - RelativePath="..\include\mupdf\memento.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf.h" - > - </File> - <File - RelativePath="..\include\mupdf\xps.h" - > - </File> - <Filter - Name="pdf" - > - <File - RelativePath="..\include\mupdf\pdf\annot.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\cmap.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\crypt.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\document.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\event.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\field.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\font.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\javascript.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\object.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\output-pdf.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\page.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\parse.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\resource.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\widget.h" - > - </File> - <File - RelativePath="..\include\mupdf\pdf\xref.h" - > - </File> - </Filter> - <Filter - Name="fitz" - > - <File - RelativePath="..\include\mupdf\fitz\annotation.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\bitmap.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\buffer.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\colorspace.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\compressed-buffer.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\context.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\crypt.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\device.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\display-list.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\document.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\filter.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\font.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\function.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\getopt.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\glyph-cache.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\hash.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\image.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\link.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\math.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\meta.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\outline.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\output-pcl.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\output-png.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\output-pnm.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\output-pwg.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\output-svg.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\output.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\path.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\pixmap.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\shade.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\store.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\stream.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\string.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\structured-text.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\system.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\text.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\transition.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\write-document.h" - > - </File> - <File - RelativePath="..\include\mupdf\fitz\xml.h" - > - </File> - </Filter> + Name="pdf" + > + <File + RelativePath="..\..\include\mupdf\pdf\annot.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\cmap.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\crypt.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\document.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\event.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\field.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\font.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\javascript.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\object.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\output-pdf.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\page.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\parse.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\resource.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\widget.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\pdf\xref.h" + > + </File> + </Filter> + <Filter + Name="fitz" + > + <File + RelativePath="..\..\include\mupdf\fitz\annotation.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\bitmap.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\buffer.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\colorspace.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\compressed-buffer.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\context.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\crypt.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\device.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\display-list.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\document.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\filter.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\font.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\function.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\getopt.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\glyph-cache.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\hash.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\image.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\link.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\math.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\meta.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\outline.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\output-pcl.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\output-png.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\output-pnm.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\output-pwg.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\output-svg.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\output.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\path.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\pixmap.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\shade.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\store.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\stream.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\string.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\structured-text.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\system.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\text.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\transition.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\write-document.h" + > + </File> + <File + RelativePath="..\..\include\mupdf\fitz\xml.h" + > + </File> </Filter> </Filter> </Files> diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 32576cfe..ac17de00 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=1;verbose=-1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -102,7 +102,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -162,7 +162,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";MEMENTO=1;DEBUG=1;verbose=-1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -206,127 +206,127 @@ Name="libjpeg" > <File - RelativePath="..\thirdparty\jpeg\jaricom.c" + RelativePath="..\..\thirdparty\jpeg\jaricom.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jcomapi.c" + RelativePath="..\..\thirdparty\jpeg\jcomapi.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdapimin.c" + RelativePath="..\..\thirdparty\jpeg\jdapimin.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdapistd.c" + RelativePath="..\..\thirdparty\jpeg\jdapistd.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdarith.c" + RelativePath="..\..\thirdparty\jpeg\jdarith.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdatadst.c" + RelativePath="..\..\thirdparty\jpeg\jdatadst.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdatasrc.c" + RelativePath="..\..\thirdparty\jpeg\jdatasrc.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdcoefct.c" + RelativePath="..\..\thirdparty\jpeg\jdcoefct.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdcolor.c" + RelativePath="..\..\thirdparty\jpeg\jdcolor.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jddctmgr.c" + RelativePath="..\..\thirdparty\jpeg\jddctmgr.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdhuff.c" + RelativePath="..\..\thirdparty\jpeg\jdhuff.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdinput.c" + RelativePath="..\..\thirdparty\jpeg\jdinput.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdmainct.c" + RelativePath="..\..\thirdparty\jpeg\jdmainct.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdmarker.c" + RelativePath="..\..\thirdparty\jpeg\jdmarker.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdmaster.c" + RelativePath="..\..\thirdparty\jpeg\jdmaster.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdmerge.c" + RelativePath="..\..\thirdparty\jpeg\jdmerge.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdpostct.c" + RelativePath="..\..\thirdparty\jpeg\jdpostct.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdsample.c" + RelativePath="..\..\thirdparty\jpeg\jdsample.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jdtrans.c" + RelativePath="..\..\thirdparty\jpeg\jdtrans.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jerror.c" + RelativePath="..\..\thirdparty\jpeg\jerror.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jfdctflt.c" + RelativePath="..\..\thirdparty\jpeg\jfdctflt.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jfdctfst.c" + RelativePath="..\..\thirdparty\jpeg\jfdctfst.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jfdctint.c" + RelativePath="..\..\thirdparty\jpeg\jfdctint.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jidctflt.c" + RelativePath="..\..\thirdparty\jpeg\jidctflt.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jidctfst.c" + RelativePath="..\..\thirdparty\jpeg\jidctfst.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jidctint.c" + RelativePath="..\..\thirdparty\jpeg\jidctint.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jmemmgr.c" + RelativePath="..\..\thirdparty\jpeg\jmemmgr.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jmemnobs.c" + RelativePath="..\..\thirdparty\jpeg\jmemnobs.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jquant1.c" + RelativePath="..\..\thirdparty\jpeg\jquant1.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jquant2.c" + RelativePath="..\..\thirdparty\jpeg\jquant2.c" > </File> <File - RelativePath="..\thirdparty\jpeg\jutils.c" + RelativePath="..\..\thirdparty\jpeg\jutils.c" > </File> </Filter> @@ -334,63 +334,63 @@ Name="libjbig2dec" > <File - RelativePath="..\thirdparty\jbig2dec\jbig2.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_arith.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_arith_iaid.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith_iaid.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_arith_int.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith_int.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_generic.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_generic.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_halftone.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_halftone.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_huffman.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_huffman.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_image.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_image.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_metadata.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_metadata.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_mmr.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_mmr.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_page.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_page.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_refinement.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_refinement.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_segment.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_segment.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_symbol_dict.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_symbol_dict.c" > </File> <File - RelativePath="..\thirdparty\jbig2dec\jbig2_text.c" + RelativePath="..\..\thirdparty\jbig2dec\jbig2_text.c" > </File> </Filter> @@ -398,43 +398,43 @@ Name="libz" > <File - RelativePath="..\thirdparty\zlib\adler32.c" + RelativePath="..\..\thirdparty\zlib\adler32.c" > </File> <File - RelativePath="..\thirdparty\zlib\compress.c" + RelativePath="..\..\thirdparty\zlib\compress.c" > </File> <File - RelativePath="..\thirdparty\zlib\crc32.c" + RelativePath="..\..\thirdparty\zlib\crc32.c" > </File> <File - RelativePath="..\thirdparty\zlib\deflate.c" + RelativePath="..\..\thirdparty\zlib\deflate.c" > </File> <File - RelativePath="..\thirdparty\zlib\inffast.c" + RelativePath="..\..\thirdparty\zlib\inffast.c" > </File> <File - RelativePath="..\thirdparty\zlib\inflate.c" + RelativePath="..\..\thirdparty\zlib\inflate.c" > </File> <File - RelativePath="..\thirdparty\zlib\inftrees.c" + RelativePath="..\..\thirdparty\zlib\inftrees.c" > </File> <File - RelativePath="..\thirdparty\zlib\trees.c" + RelativePath="..\..\thirdparty\zlib\trees.c" > </File> <File - RelativePath="..\thirdparty\zlib\uncompr.c" + RelativePath="..\..\thirdparty\zlib\uncompr.c" > </File> <File - RelativePath="..\thirdparty\zlib\zutil.c" + RelativePath="..\..\thirdparty\zlib\zutil.c" > </File> </Filter> @@ -445,211 +445,211 @@ Name="openjp2" > <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\bio.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\bio.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cio.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cio.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\dwt.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\dwt.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\event.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\event.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\event.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\event.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\function_list.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\function_list.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\image.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\image.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\image.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\image.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\invert.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\invert.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\j2k.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\j2k.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\jp2.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\jp2.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mct.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mct.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mqc.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mqc.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\pi.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\pi.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\raw.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\raw.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t2.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t2.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tcd.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tcd.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tgt.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tgt.h" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.h" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" > </File> <File - RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" + RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" > </File> </Filter> @@ -658,90 +658,90 @@ Name="libfreetype" > <File - RelativePath="..\thirdparty\freetype\src\cff\cff.c" + RelativePath="..\..\thirdparty\freetype\src\cff\cff.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\psaux\psaux.c" + RelativePath="..\..\thirdparty\freetype\src\psaux\psaux.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\pshinter\pshinter.c" + RelativePath="..\..\thirdparty\freetype\src\pshinter\pshinter.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\psnames\psnames.c" + RelativePath="..\..\thirdparty\freetype\src\psnames\psnames.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\raster\raster.c" + RelativePath="..\..\thirdparty\freetype\src\raster\raster.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\sfnt\sfnt.c" + RelativePath="..\..\thirdparty\freetype\src\sfnt\sfnt.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\smooth\smooth.c" + RelativePath="..\..\thirdparty\freetype\src\smooth\smooth.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\truetype\truetype.c" + RelativePath="..\..\thirdparty\freetype\src\truetype\truetype.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\type1\type1.c" + RelativePath="..\..\thirdparty\freetype\src\type1\type1.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\cid\type1cid.c" + RelativePath="..\..\thirdparty\freetype\src\cid\type1cid.c" > </File> <Filter Name="base" > <File - RelativePath="..\thirdparty\freetype\src\base\ftbase.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftbase.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftbbox.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftbbox.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftbitmap.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftbitmap.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftgasp.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftgasp.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftglyph.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftglyph.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftinit.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftinit.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftstroke.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftstroke.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftsynth.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftsynth.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftsystem.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftsystem.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\fttype1.c" + RelativePath="..\..\thirdparty\freetype\src\base\fttype1.c" > </File> <File - RelativePath="..\thirdparty\freetype\src\base\ftxf86.c" + RelativePath="..\..\thirdparty\freetype\src\base\ftxf86.c" > </File> </Filter> @@ -749,201 +749,201 @@ Name="include" > <File - RelativePath="..\thirdparty\freetype\include\ft2build.h" + RelativePath="..\..\thirdparty\freetype\include\ft2build.h" > </File> <Filter Name="freetype" > <File - RelativePath="..\thirdparty\freetype\include\freetype\freetype.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\freetype.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftadvanc.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftadvanc.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftbbox.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftbbox.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftbdf.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftbdf.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftbitmap.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftbitmap.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftbzip2.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftbzip2.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftcache.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftcache.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftchapters.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftchapters.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftcid.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftcid.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\fterrdef.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\fterrdef.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\fterrors.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\fterrors.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftgasp.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftgasp.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftglyph.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftglyph.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftgxval.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftgxval.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftgzip.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftgzip.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftimage.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftimage.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftincrem.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftincrem.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftlcdfil.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftlcdfil.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftlist.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftlist.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftlzw.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftlzw.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftmac.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftmac.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftmm.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftmm.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftmodapi.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftmodapi.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftmoderr.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftmoderr.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftotval.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftotval.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftoutln.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftoutln.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftpfr.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftpfr.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftrender.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftrender.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftsizes.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftsizes.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftsnames.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftsnames.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftstroke.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftstroke.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftsynth.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftsynth.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftsystem.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftsystem.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\fttrigon.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\fttrigon.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\fttypes.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\fttypes.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftwinfnt.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftwinfnt.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ftxf86.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ftxf86.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\t1tables.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\t1tables.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ttnameid.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ttnameid.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\tttables.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\tttables.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\tttags.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\tttags.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\ttunpat.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\ttunpat.h" > </File> <Filter Name="config" > <File - RelativePath="..\thirdparty\freetype\include\freetype\config\ftconfig.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\config\ftconfig.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\config\ftheader.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\config\ftheader.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\config\ftmodule.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\config\ftmodule.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\config\ftoption.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\config\ftoption.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\config\ftstdlib.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\config\ftstdlib.h" > </File> </Filter> @@ -951,150 +951,150 @@ Name="internal" > <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\autohint.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\autohint.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftcalc.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftcalc.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftdebug.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftdebug.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftdriver.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftdriver.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftgloadr.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftgloadr.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftmemory.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftmemory.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftobjs.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftobjs.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftpic.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftpic.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftrfork.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftrfork.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftserv.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftserv.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftstream.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftstream.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\fttrace.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\fttrace.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\ftvalid.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\ftvalid.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\internal.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\internal.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\psaux.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\psaux.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\pshints.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\pshints.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\sfnt.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\sfnt.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\t1types.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\t1types.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\tttypes.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\tttypes.h" > </File> <Filter Name="services" > <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svbdf.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svbdf.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svcid.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svcid.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svgldict.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svgldict.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svgxval.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svgxval.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svkern.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svkern.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svmm.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svmm.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svotval.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svotval.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svpfr.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svpfr.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svpostnm.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svpostnm.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svpscmap.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svpscmap.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svpsinfo.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svpsinfo.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svsfnt.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svsfnt.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svttcmap.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svttcmap.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svtteng.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svtteng.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svttglyf.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svttglyf.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svwinfnt.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svwinfnt.h" > </File> <File - RelativePath="..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h" + RelativePath="..\..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h" > </File> </Filter> diff --git a/platform/win32/mudraw.vcproj b/platform/win32/mudraw.vcproj index 6310fb06..b28291df 100644 --- a/platform/win32/mudraw.vcproj +++ b/platform/win32/mudraw.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -185,7 +185,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\mudraw.c" + RelativePath="..\..\source\tools\mudraw.c" > </File> </Files> diff --git a/platform/win32/mujstest-v8.vcproj b/platform/win32/mujstest-v8.vcproj index 1b37bb12..81d93db3 100644 --- a/platform/win32/mujstest-v8.vcproj +++ b/platform/win32/mujstest-v8.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -60,7 +60,7 @@ Name="VCLinkerTool" AdditionalOptions="/FORCE" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\build\Debug\lib\"" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\build\Debug\lib\"" GenerateDebugInformation="true" TargetMachine="1" /> @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -134,7 +134,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\build\Release\lib"" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\build\Release\lib"" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -190,7 +190,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -210,7 +210,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\Build\Debug\lib"" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\Build\Debug\lib"" GenerateDebugInformation="true" TargetMachine="1" /> @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -285,7 +285,7 @@ Name="VCLinkerTool" AdditionalOptions="/FORCE" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib libeay32.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\build\Debug\lib\";..\thirdparty\openssl\lib" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\build\Debug\lib\";..\..\thirdparty\openssl\lib" GenerateDebugInformation="true" TargetMachine="1" /> @@ -341,7 +341,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="HAVE_OPENSSL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -360,7 +360,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="v8_base.lib v8_snapshot.lib libeay32.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\build\release\lib\";..\thirdparty\openssl\lib" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\build\release\lib\";..\..\thirdparty\openssl\lib" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -396,35 +396,15 @@ </References> <Files> <File - RelativePath="..\fitz\crypt_pkcs7.c" + RelativePath="..\..\platform\x11\jstest_main.c" > - <FileConfiguration - Name="DebugOpenssl|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\thirdparty\openssl\include;..\generated" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseOpenssl|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\thirdparty\openssl\include" - /> - </FileConfiguration> </File> <File - RelativePath="..\apps\jstest_main.c" + RelativePath="..\..\platform\x11\pdfapp.c" > </File> <File - RelativePath="..\apps\pdfapp.c" - > - </File> - <File - RelativePath="..\apps\pdfapp.h" + RelativePath="..\..\platform\x11\pdfapp.h" > </File> </Files> diff --git a/platform/win32/mupdf-v8.vcproj b/platform/win32/mupdf-v8.vcproj index c66c2d99..93c4dbb9 100644 --- a/platform/win32/mupdf-v8.vcproj +++ b/platform/win32/mupdf-v8.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -60,7 +60,7 @@ Name="VCLinkerTool" AdditionalOptions="/FORCE" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\build\Debug\lib"" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\build\Debug\lib"" GenerateDebugInformation="true" TargetMachine="1" /> @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -134,7 +134,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\Build\release\lib"" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\Build\release\lib"" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -190,7 +190,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -210,7 +210,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="v8_base.lib v8_snapshot.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\Build\Debug\lib"" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\Build\Debug\lib"" GenerateDebugInformation="true" TargetMachine="1" /> @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -285,7 +285,7 @@ Name="VCLinkerTool" AdditionalOptions="/FORCE" AdditionalDependencies="v8_base.lib v8_snapshot.lib libeay32.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\build\Debug\lib";..\thirdparty\openssl\lib" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\build\Debug\lib";..\..\thirdparty\openssl\lib" GenerateDebugInformation="true" TargetMachine="1" /> @@ -341,7 +341,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="HAVE_OPENSSL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -360,7 +360,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="v8_base.lib v8_snapshot.lib libeay32.lib ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\thirdparty\v8-3.9\Build\release\lib";..\thirdparty\openssl\lib" + AdditionalLibraryDirectories=""..\..\thirdparty\v8-3.9\Build\release\lib";..\..\thirdparty\openssl\lib" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -396,39 +396,19 @@ </References> <Files> <File - RelativePath="..\fitz\crypt_pkcs7.c" + RelativePath="..\..\platform\x11\pdfapp.c" > - <FileConfiguration - Name="DebugOpenssl|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\thirdparty\openssl\include;..\generated" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseOpenssl|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\thirdparty\openssl\include" - /> - </FileConfiguration> </File> <File - RelativePath="..\apps\pdfapp.c" + RelativePath="..\..\platform\x11\pdfapp.h" > </File> <File - RelativePath="..\apps\pdfapp.h" + RelativePath="..\..\platform\x11\win_main.c" > </File> <File - RelativePath="..\apps\win_main.c" - > - </File> - <File - RelativePath="..\apps\win_res.rc" + RelativePath="..\..\platform\x11\win_res.rc" > </File> </Files> diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 7b3de7fa..a179a008 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-v8", "libmupdf-v8.vcproj", "{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-js-v8", "libmupdf-js-v8.vcproj", "{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}" ProjectSection(ProjectDependencies) = postProject {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection @@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest-v8", "mujstest-v8. {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} = {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-nov8", "libmupdf-nov8.vcproj", "{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-js-none", "libmupdf-js-none.vcproj", "{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}" ProjectSection(ProjectDependencies) = postProject {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection @@ -81,14 +81,14 @@ Global {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.ActiveCfg = Debug|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.Build.0 = Debug|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Memento|Win32.ActiveCfg = Memento|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Memento|Win32.Build.0 = Memento|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.ActiveCfg = Release|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.Build.0 = Release|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.ActiveCfg = Debug|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.Build.0 = Debug|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 @@ -121,14 +121,14 @@ Global {A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Debug|Win32.ActiveCfg = Debug|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Debug|Win32.Build.0 = Debug|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Memento|Win32.ActiveCfg = Memento|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Memento|Win32.Build.0 = Memento|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Release|Win32.ActiveCfg = Release|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Release|Win32.Build.0 = Release|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {9035A4F3-4219-45A5-985D-FBF4D9609713}.Debug|Win32.ActiveCfg = Debug|Win32 {9035A4F3-4219-45A5-985D-FBF4D9609713}.Debug|Win32.Build.0 = Debug|Win32 {9035A4F3-4219-45A5-985D-FBF4D9609713}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 @@ -151,14 +151,14 @@ Global {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Debug|Win32.ActiveCfg = Debug|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Debug|Win32.Build.0 = Debug|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Memento|Win32.ActiveCfg = Memento|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Memento|Win32.Build.0 = Memento|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Release|Win32.ActiveCfg = Release|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Release|Win32.Build.0 = Release|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/platform/win32/mupdf.vcproj b/platform/win32/mupdf.vcproj index eca2df73..42289186 100644 --- a/platform/win32/mupdf.vcproj +++ b/platform/win32/mupdf.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -185,7 +185,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -257,7 +257,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -277,7 +277,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="libeay32.lib" - AdditionalLibraryDirectories="..\thirdparty\openssl\lib" + AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" GenerateDebugInformation="true" TargetMachine="1" /> @@ -333,7 +333,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="HAVE_OPENSSL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -352,7 +352,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="libeay32.lib" - AdditionalLibraryDirectories="..\thirdparty\openssl\lib" + AdditionalLibraryDirectories="..\..\thirdparty\openssl\lib" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -388,39 +388,19 @@ </References> <Files> <File - RelativePath="..\fitz\crypt_pkcs7.c" + RelativePath="..\..\platform\x11\pdfapp.c" > - <FileConfiguration - Name="DebugOpenssl|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\thirdparty\openssl\include;..\generated" - /> - </FileConfiguration> - <FileConfiguration - Name="ReleaseOpenssl|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\thirdparty\openssl\include" - /> - </FileConfiguration> </File> <File - RelativePath="..\apps\pdfapp.c" + RelativePath="..\..\platform\x11\pdfapp.h" > </File> <File - RelativePath="..\apps\pdfapp.h" + RelativePath="..\..\platform\x11\win_main.c" > </File> <File - RelativePath="..\apps\win_main.c" - > - </File> - <File - RelativePath="..\apps\win_res.rc" + RelativePath="..\..\platform\x11\win_res.rc" > </File> </Files> diff --git a/platform/win32/mutool.vcproj b/platform/win32/mutool.vcproj index a208dbc6..891f62c4 100644 --- a/platform/win32/mutool.vcproj +++ b/platform/win32/mutool.vcproj @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -185,7 +185,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -237,27 +237,27 @@ </References> <Files> <File - RelativePath="..\apps\mutool.c" + RelativePath="..\..\source\tools\mutool.c" > </File> <File - RelativePath="..\apps\pdfclean.c" + RelativePath="..\..\source\tools\pdfclean.c" > </File> <File - RelativePath="..\apps\pdfextract.c" + RelativePath="..\..\source\tools\pdfextract.c" > </File> <File - RelativePath="..\apps\pdfinfo.c" + RelativePath="..\..\source\tools\pdfinfo.c" > </File> <File - RelativePath="..\apps\pdfposter.c" + RelativePath="..\..\source\tools\pdfposter.c" > </File> <File - RelativePath="..\apps\pdfshow.c" + RelativePath="..\..\source\tools\pdfshow.c" > </File> </Files> diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c index 96bed646..cc1534dc 100644 --- a/scripts/cmapdump.c +++ b/scripts/cmapdump.c @@ -8,17 +8,17 @@ #include "mupdf/pdf.h" -#include "../fitz/base_context.c" -#include "../fitz/base_error.c" -#include "../fitz/base_memory.c" -#include "../fitz/base_string.c" -#include "../fitz/stm_buffer.c" -#include "../fitz/stm_open.c" -#include "../fitz/stm_read.c" - -#include "../pdf/pdf_lex.c" -#include "../pdf/pdf_cmap.c" -#include "../pdf/pdf_cmap_parse.c" +#include "../source/fitz/context.c" +#include "../source/fitz/error.c" +#include "../source/fitz/memory.c" +#include "../source/fitz/string.c" +#include "../source/fitz/buffer.c" +#include "../source/fitz/stream-open.c" +#include "../source/fitz/stream-read.c" + +#include "../source/pdf/pdf-lex.c" +#include "../source/pdf/pdf-cmap.c" +#include "../source/pdf/pdf-cmap-parse.c" static void clean(char *p) diff --git a/source/img/muimage.c b/source/img/muimage.c index ed3280b2..759653a7 100644 --- a/source/img/muimage.c +++ b/source/img/muimage.c @@ -1,4 +1,4 @@ -#include "mupdf/image.h" +#include "mupdf/img.h" #include <ctype.h> /* for tolower */ |