summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--Makerules2
-rw-r--r--Makethird16
-rw-r--r--scripts/cmapdump.c (renamed from pdf/cmapdump.c)0
-rw-r--r--scripts/fontdump.c (renamed from pdf/fontdump.c)0
-rwxr-xr-xscripts/glyphdump.py (renamed from pdf/glyphdump.py)0
-rw-r--r--scripts/glyphlist.txt (renamed from pdf/glyphlist.txt)0
-rw-r--r--scripts/jconfig.h (renamed from win32/jconfig.h)0
-rw-r--r--scripts/opj_config.h (renamed from win32/opj_config.h)12
-rw-r--r--scripts/rename.sed (renamed from rename.sed)0
-rw-r--r--scripts/slimftmodules.h (renamed from win32/slimftmodules.h)0
-rw-r--r--scripts/slimftoptions.h (renamed from win32/slimftoptions.h)0
-rw-r--r--win32/libmupdf.vcproj4
-rw-r--r--win32/libthirdparty.vcproj4
14 files changed, 16 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index dc1e80bc..0f9af691 100644
--- a/Makefile
+++ b/Makefile
@@ -197,6 +197,8 @@ $(OBJDIR)/%.o: pdf/%.c
$(CC_CMD)
$(OBJDIR)/%.o: xps/%.c
$(CC_CMD)
+$(OBJDIR)/%.o: scripts/%.c
+ $(CC_CMD)
$(OBJDIR)/%.o: $(GENDIR)/%.c
$(CC_CMD)
diff --git a/Makerules b/Makerules
index eaee8f63..bcb50be7 100644
--- a/Makerules
+++ b/Makerules
@@ -7,7 +7,7 @@ CC ?=
CFLAGS ?=
LDFLAGS ?=
-CFLAGS += -Ifitz -Ipdf -Ixps -Wall
+CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -Wall
ifeq "$(build)" "debug"
CFLAGS += -pipe -g
diff --git a/Makethird b/Makethird
index c58af8e1..e56020c9 100644
--- a/Makethird
+++ b/Makethird
@@ -26,7 +26,7 @@ FREETYPE_LIB=$(OBJDIR)/libfreetype.a
$(FREETYPE_LIB): $(FREETYPE_OBJ)
$(AR_CMD)
-FTCC_CMD = $(CC_CMD) -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -Iwin32 \
+FTCC_CMD = $(CC_CMD) -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
'-DFT_CONFIG_MODULES_H="slimftmodules.h"' \
'-DFT_CONFIG_OPTIONS_H="slimftoptions.h"'
@@ -104,13 +104,9 @@ endif
ifneq "$(jpeg_dir)" ""
THIRD_LIBS += $(JPEG_LIB)
-THIRD_INCS += -I$(jpeg_dir) -I$(OBJDIR)
+THIRD_INCS += -I$(jpeg_dir)
LIBS := $(filter-out -ljpeg, $(LIBS))
-# jconfig.h does not exist in the pristine source
-$(OBJDIR)/jconfig.h:
- cp $(jpeg_dir)/jconfig.txt $@
-
JPEG_SRC=$(addprefix $(jpeg_dir)/, \
jaricom.c \
jcomapi.c \
@@ -145,7 +141,6 @@ JPEG_SRC=$(addprefix $(jpeg_dir)/, \
jmemansi.c)
JPEG_OBJ=$(JPEG_SRC:$(jpeg_dir)/%.c=$(OBJDIR)/jpeg_%.o)
JPEG_LIB=$(OBJDIR)/libjpeg.a
-$(JPEG_OBJ): $(OBJDIR)/jconfig.h
$(JPEG_LIB): $(JPEG_OBJ)
$(AR_CMD)
$(OBJDIR)/jpeg_%.o: $(jpeg_dir)/%.c
@@ -159,10 +154,6 @@ THIRD_LIBS += $(OPENJPEG_LIB)
THIRD_INCS += -I$(openjpeg_dir)
LIBS := $(filter-out -lopenjpeg, $(LIBS))
-# opj_config.h does not exist in the pristine source
-$(OBJDIR)/opj_config.h:
- cp $(openjpeg_dir)/../opj_config.h.in.user $@
-
OPENJPEG_SRC=$(addprefix $(openjpeg_dir)/, \
bio.c \
cio.c \
@@ -184,11 +175,10 @@ OPENJPEG_SRC=$(addprefix $(openjpeg_dir)/, \
tgt.c )
OPENJPEG_OBJ=$(OPENJPEG_SRC:$(openjpeg_dir)/%.c=$(OBJDIR)/opj_%.o)
OPENJPEG_LIB=$(OBJDIR)/libopenjpeg.a
-$(OPENJPEG_OBJ): $(OBJDIR)/opj_config.h
$(OPENJPEG_LIB): $(OPENJPEG_OBJ)
$(AR_CMD)
$(OBJDIR)/opj_%.o: $(openjpeg_dir)/%.c
- $(CC_CMD) -I$(OBJDIR) -DOPJ_STATIC
+ $(CC_CMD) -DOPJ_STATIC
endif
diff --git a/pdf/cmapdump.c b/scripts/cmapdump.c
index 94f3c140..94f3c140 100644
--- a/pdf/cmapdump.c
+++ b/scripts/cmapdump.c
diff --git a/pdf/fontdump.c b/scripts/fontdump.c
index 37572bea..37572bea 100644
--- a/pdf/fontdump.c
+++ b/scripts/fontdump.c
diff --git a/pdf/glyphdump.py b/scripts/glyphdump.py
index 25b2afcc..25b2afcc 100755
--- a/pdf/glyphdump.py
+++ b/scripts/glyphdump.py
diff --git a/pdf/glyphlist.txt b/scripts/glyphlist.txt
index b21e977d..b21e977d 100644
--- a/pdf/glyphlist.txt
+++ b/scripts/glyphlist.txt
diff --git a/win32/jconfig.h b/scripts/jconfig.h
index 679404da..679404da 100644
--- a/win32/jconfig.h
+++ b/scripts/jconfig.h
diff --git a/win32/opj_config.h b/scripts/opj_config.h
index f86ccce6..d34edd22 100644
--- a/win32/opj_config.h
+++ b/scripts/opj_config.h
@@ -1,16 +1,16 @@
/* If you want to build the library manually without using
* 'configure' or 'CMake'
- * then copy this file
- * 'opj_config.h.in.user'
- * to
+ * then copy this file
+ * 'opj_config.h.in.user'
+ * to
* 'opj_config.h'
- *
+ *
* Open 'opj_config.h' and change the file contents
- * if you want to define something because you know you have
+ * if you want to define something because you know you have
* BOTH installed the library AND the header file(s).
* Then e.g. write
#define HAVE_LIBPNG 1
- *
+ *
*
* The file 'opj_config.h' will be included in some source files.
* ==== YOU CAN NOT COMPILE WITHOUT IT. ====
diff --git a/rename.sed b/scripts/rename.sed
index 2949bf92..2949bf92 100644
--- a/rename.sed
+++ b/scripts/rename.sed
diff --git a/win32/slimftmodules.h b/scripts/slimftmodules.h
index 96e87d8d..96e87d8d 100644
--- a/win32/slimftmodules.h
+++ b/scripts/slimftmodules.h
diff --git a/win32/slimftoptions.h b/scripts/slimftoptions.h
index 066ee377..066ee377 100644
--- a/win32/slimftoptions.h
+++ b/scripts/slimftoptions.h
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index 6d2cc520..3827d0c0 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\win32;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+ AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -101,7 +101,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\win32;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+ AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/win32/libthirdparty.vcproj b/win32/libthirdparty.vcproj
index 697df02b..3ebd4a85 100644
--- a/win32/libthirdparty.vcproj
+++ b/win32/libthirdparty.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\win32;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+ AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -103,7 +103,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\win32;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+ AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 11:50:43 +0000