summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Jamfile68
-rw-r--r--base/base_cpudep.c (renamed from fitz/base_cpudep.c)0
-rw-r--r--base/base_error.c (renamed from fitz/base_error.c)0
-rw-r--r--base/base_hash.c (renamed from fitz/base_hash.c)0
-rw-r--r--base/base_matrix.c (renamed from fitz/base_matrix.c)0
-rw-r--r--base/base_memory.c (renamed from fitz/base_memory.c)0
-rw-r--r--base/base_rect.c (renamed from fitz/base_rect.c)0
-rw-r--r--base/base_rune.c (renamed from fitz/base_rune.c)0
-rw-r--r--base/util_getopt.c (renamed from fitz/util_getopt.c)0
-rw-r--r--base/util_strlcat.c (renamed from fitz/util_strlcat.c)0
-rw-r--r--base/util_strlcpy.c (renamed from fitz/util_strlcpy.c)0
-rw-r--r--base/util_strsep.c (renamed from fitz/util_strsep.c)0
-rw-r--r--raster/archppc.c (renamed from render/archppc.c)0
-rw-r--r--raster/archsparc.c (renamed from render/archsparc.c)0
-rw-r--r--raster/archx86.c (renamed from render/archx86.c)0
-rw-r--r--raster/glyphcache.c (renamed from render/glyphcache.c)0
-rw-r--r--raster/imagedraw.c (renamed from render/imagedraw.c)0
-rw-r--r--raster/imagescale.c (renamed from render/imagescale.c)0
-rw-r--r--raster/imageunpack.c (renamed from render/imageunpack.c)0
-rw-r--r--raster/meshdraw.c (renamed from render/meshdraw.c)0
-rw-r--r--raster/pathfill.c (renamed from render/pathfill.c)0
-rw-r--r--raster/pathscan.c (renamed from render/pathscan.c)0
-rw-r--r--raster/pathstroke.c (renamed from render/pathstroke.c)0
-rw-r--r--raster/pixmap.c (renamed from render/pixmap.c)0
-rw-r--r--raster/porterduff.c (renamed from render/porterduff.c)0
-rw-r--r--raster/render.c (renamed from render/render.c)0
-rw-r--r--world/node_misc1.c (renamed from fitz/node_misc1.c)0
-rw-r--r--world/node_misc2.c (renamed from fitz/node_misc2.c)0
-rw-r--r--world/node_optimize.c (renamed from fitz/node_optimize.c)0
-rw-r--r--world/node_path.c (renamed from fitz/node_path.c)0
-rw-r--r--world/node_text.c (renamed from fitz/node_text.c)0
-rw-r--r--world/node_tolisp.c (renamed from fitz/node_tolisp.c)0
-rw-r--r--world/node_toxml.c (renamed from fitz/node_toxml.c)0
-rw-r--r--world/node_tree.c (renamed from fitz/node_tree.c)0
-rw-r--r--world/res_cmap.c (renamed from fitz/res_cmap.c)0
-rw-r--r--world/res_colorspace.c (renamed from fitz/res_colorspace.c)0
-rw-r--r--world/res_font.c (renamed from fitz/res_font.c)0
-rw-r--r--world/res_image.c (renamed from fitz/res_image.c)0
-rw-r--r--world/res_shade.c (renamed from fitz/res_shade.c)0
39 files changed, 40 insertions, 28 deletions
diff --git a/Jamfile b/Jamfile
index 1cb9ae3b..f8919f0b 100644
--- a/Jamfile
+++ b/Jamfile
@@ -17,7 +17,13 @@ ALL_LOCATE_TARGET = [ FDirName $(TOP) build $(BUILD) ] ;
BINDIR = [ FDirName $(TOP) dist ] ;
LINKLIBS = $(FREETYPELD) -lexpat -ljpeg -lz -lm ;
-FITZLIBS = libsamus libmupdf libstream libfitz librender libfonts ;
+FITZLIBS =
+ libsamus libmupdf libfonts
+ libraster
+ libworld
+ libstream
+ libbase
+;
if $(HAVE_JASPER) = yes
{
@@ -86,10 +92,9 @@ rule XCopy
# --------------------------------------------------------------------------
-SubDir TOP fitz ;
-
-Library libfitz :
+SubDir TOP base ;
+Library libbase :
base_cpudep.c
base_error.c
base_hash.c
@@ -97,27 +102,12 @@ Library libfitz :
base_memory.c
base_rect.c
base_rune.c
-
- node_toxml.c
- node_misc1.c
- node_misc2.c
- node_optimize.c
- node_path.c
- node_text.c
- node_tree.c
-
- res_cmap.c
- res_colorspace.c
- res_font.c
- res_image.c
- res_shade.c
-
;
-if $(NEED_GETOPT) = yes { Library libfitz : util_getopt.c ; }
-if $(NEED_STRLCAT) = yes { Library libfitz : util_strlcat.c ; }
-if $(NEED_STRLCPY) = yes { Library libfitz : util_strlcpy.c ; }
-if $(NEED_STRSEP) = yes { Library libfitz : util_strsep.c ; }
+if $(NEED_GETOPT) = yes { Library libbase : util_getopt.c ; }
+if $(NEED_STRLCAT) = yes { Library libbase : util_strlcat.c ; }
+if $(NEED_STRLCPY) = yes { Library libbase : util_strlcpy.c ; }
+if $(NEED_STRSEP) = yes { Library libbase : util_strsep.c ; }
# --------------------------------------------------------------------------
@@ -169,9 +159,31 @@ if $(HAVE_JBIG2DEC) = yes { Library libstream : filt_jbig2d.c ; }
# --------------------------------------------------------------------------
-SubDir TOP render ;
+SubDir TOP world ;
+
+Library libworld :
+
+ node_toxml.c
+ node_misc1.c
+ node_misc2.c
+ node_optimize.c
+ node_path.c
+ node_text.c
+ node_tree.c
+
+ res_cmap.c
+ res_colorspace.c
+ res_font.c
+ res_image.c
+ res_shade.c
+
+ ;
+
+# --------------------------------------------------------------------------
+
+SubDir TOP raster ;
-Library librender :
+Library libraster :
glyphcache.c
pixmap.c
porterduff.c
@@ -185,9 +197,9 @@ Library librender :
render.c
;
-if $(OSPLAT) = PPC { Library librender : archppc.c ; }
-if $(OSPLAT) = SPARC { Library librender : archsparc.c ; }
-if $(OSPLAT) = X86 { Library librender : archx86.c ; }
+if $(OSPLAT) = PPC { Library libraster : archppc.c ; }
+if $(OSPLAT) = SPARC { Library libraster : archsparc.c ; }
+if $(OSPLAT) = X86 { Library libraster : archx86.c ; }
# --------------------------------------------------------------------------
diff --git a/fitz/base_cpudep.c b/base/base_cpudep.c
index 0db2e331..0db2e331 100644
--- a/fitz/base_cpudep.c
+++ b/base/base_cpudep.c
diff --git a/fitz/base_error.c b/base/base_error.c
index 926c48dc..926c48dc 100644
--- a/fitz/base_error.c
+++ b/base/base_error.c
diff --git a/fitz/base_hash.c b/base/base_hash.c
index 65bc7130..65bc7130 100644
--- a/fitz/base_hash.c
+++ b/base/base_hash.c
diff --git a/fitz/base_matrix.c b/base/base_matrix.c
index e24196f9..e24196f9 100644
--- a/fitz/base_matrix.c
+++ b/base/base_matrix.c
diff --git a/fitz/base_memory.c b/base/base_memory.c
index 48988dbc..48988dbc 100644
--- a/fitz/base_memory.c
+++ b/base/base_memory.c
diff --git a/fitz/base_rect.c b/base/base_rect.c
index 18acb952..18acb952 100644
--- a/fitz/base_rect.c
+++ b/base/base_rect.c
diff --git a/fitz/base_rune.c b/base/base_rune.c
index 4aa81df3..4aa81df3 100644
--- a/fitz/base_rune.c
+++ b/base/base_rune.c
diff --git a/fitz/util_getopt.c b/base/util_getopt.c
index c870e206..c870e206 100644
--- a/fitz/util_getopt.c
+++ b/base/util_getopt.c
diff --git a/fitz/util_strlcat.c b/base/util_strlcat.c
index c659b73a..c659b73a 100644
--- a/fitz/util_strlcat.c
+++ b/base/util_strlcat.c
diff --git a/fitz/util_strlcpy.c b/base/util_strlcpy.c
index 73416ae1..73416ae1 100644
--- a/fitz/util_strlcpy.c
+++ b/base/util_strlcpy.c
diff --git a/fitz/util_strsep.c b/base/util_strsep.c
index e54903ce..e54903ce 100644
--- a/fitz/util_strsep.c
+++ b/base/util_strsep.c
diff --git a/render/archppc.c b/raster/archppc.c
index 2d0fee1d..2d0fee1d 100644
--- a/render/archppc.c
+++ b/raster/archppc.c
diff --git a/render/archsparc.c b/raster/archsparc.c
index 32e142c3..32e142c3 100644
--- a/render/archsparc.c
+++ b/raster/archsparc.c
diff --git a/render/archx86.c b/raster/archx86.c
index a4161a1f..a4161a1f 100644
--- a/render/archx86.c
+++ b/raster/archx86.c
diff --git a/render/glyphcache.c b/raster/glyphcache.c
index 6fc8bd52..6fc8bd52 100644
--- a/render/glyphcache.c
+++ b/raster/glyphcache.c
diff --git a/render/imagedraw.c b/raster/imagedraw.c
index 0654b006..0654b006 100644
--- a/render/imagedraw.c
+++ b/raster/imagedraw.c
diff --git a/render/imagescale.c b/raster/imagescale.c
index ede19f1c..ede19f1c 100644
--- a/render/imagescale.c
+++ b/raster/imagescale.c
diff --git a/render/imageunpack.c b/raster/imageunpack.c
index 0885c293..0885c293 100644
--- a/render/imageunpack.c
+++ b/raster/imageunpack.c
diff --git a/render/meshdraw.c b/raster/meshdraw.c
index f5b1a3fb..f5b1a3fb 100644
--- a/render/meshdraw.c
+++ b/raster/meshdraw.c
diff --git a/render/pathfill.c b/raster/pathfill.c
index d25f78b1..d25f78b1 100644
--- a/render/pathfill.c
+++ b/raster/pathfill.c
diff --git a/render/pathscan.c b/raster/pathscan.c
index cea3a849..cea3a849 100644
--- a/render/pathscan.c
+++ b/raster/pathscan.c
diff --git a/render/pathstroke.c b/raster/pathstroke.c
index 2527e6ad..2527e6ad 100644
--- a/render/pathstroke.c
+++ b/raster/pathstroke.c
diff --git a/render/pixmap.c b/raster/pixmap.c
index 8f34ebcd..8f34ebcd 100644
--- a/render/pixmap.c
+++ b/raster/pixmap.c
diff --git a/render/porterduff.c b/raster/porterduff.c
index 9cd99dbb..9cd99dbb 100644
--- a/render/porterduff.c
+++ b/raster/porterduff.c
diff --git a/render/render.c b/raster/render.c
index cf69e942..cf69e942 100644
--- a/render/render.c
+++ b/raster/render.c
diff --git a/fitz/node_misc1.c b/world/node_misc1.c
index c2d6e876..c2d6e876 100644
--- a/fitz/node_misc1.c
+++ b/world/node_misc1.c
diff --git a/fitz/node_misc2.c b/world/node_misc2.c
index 5382273e..5382273e 100644
--- a/fitz/node_misc2.c
+++ b/world/node_misc2.c
diff --git a/fitz/node_optimize.c b/world/node_optimize.c
index 80a43293..80a43293 100644
--- a/fitz/node_optimize.c
+++ b/world/node_optimize.c
diff --git a/fitz/node_path.c b/world/node_path.c
index 5f4b4425..5f4b4425 100644
--- a/fitz/node_path.c
+++ b/world/node_path.c
diff --git a/fitz/node_text.c b/world/node_text.c
index 49cdb576..49cdb576 100644
--- a/fitz/node_text.c
+++ b/world/node_text.c
diff --git a/fitz/node_tolisp.c b/world/node_tolisp.c
index b03d4e28..b03d4e28 100644
--- a/fitz/node_tolisp.c
+++ b/world/node_tolisp.c
diff --git a/fitz/node_toxml.c b/world/node_toxml.c
index 04a00423..04a00423 100644
--- a/fitz/node_toxml.c
+++ b/world/node_toxml.c
diff --git a/fitz/node_tree.c b/world/node_tree.c
index f6874711..f6874711 100644
--- a/fitz/node_tree.c
+++ b/world/node_tree.c
diff --git a/fitz/res_cmap.c b/world/res_cmap.c
index 577ba7c0..577ba7c0 100644
--- a/fitz/res_cmap.c
+++ b/world/res_cmap.c
diff --git a/fitz/res_colorspace.c b/world/res_colorspace.c
index 65909bfe..65909bfe 100644
--- a/fitz/res_colorspace.c
+++ b/world/res_colorspace.c
diff --git a/fitz/res_font.c b/world/res_font.c
index 3875a0c7..3875a0c7 100644
--- a/fitz/res_font.c
+++ b/world/res_font.c
diff --git a/fitz/res_image.c b/world/res_image.c
index dbeb1fd8..dbeb1fd8 100644
--- a/fitz/res_image.c
+++ b/world/res_image.c
diff --git a/fitz/res_shade.c b/world/res_shade.c
index 67a64e4e..67a64e4e 100644
--- a/fitz/res_shade.c
+++ b/world/res_shade.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:49:28 +0000