Move scripts and config files into "scripts" directory.

6 files changed, 4 insertions, 124 deletions

diff --git a/win32/jconfig.h b/win32/jconfig.h
deleted file mode 100644
index 679404da..00000000
--- a/win32/jconfig.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
-/* see jconfig.txt for explanations */
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-/* #define void char */
-/* #define const */
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
-#undef NEED_SHORT_EXTERNAL_NAMES
-#undef INCOMPLETE_TYPES_BROKEN
-
-/* Define "boolean" as unsigned char, not int, per Windows custom */
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#define TWO_FILE_COMMANDLINE	/* optional */
-#define USE_SETMODE		/* Microsoft has setmode() */
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-#undef PROGRESS_REPORT		/* optional */
-
-#endif /* JPEG_CJPEG_DJPEG */
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"

diff --git a/win32/opj_config.h b/win32/opj_config.h
deleted file mode 100644
index f86ccce6..00000000
--- a/win32/opj_config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* If you want to build the library manually without using
- * 'configure' or 'CMake'
- * 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 
- * 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. ====
- * === DO NOT FOREGET TO CHANGE 'config.nix' APPROPRIATELY. ====
-*/
-
-/* DO NOT DEFINE BOTH VERSIONS OF LCMS */
-/* define to 1 if you have both liblcms and lcms.h installed */
-#undef HAVE_LIBLCMS1
-/* #define HAVE_LIBLCMS1 1 */
-
-/* define to 1 if you have both liblcms2 and lcms2.h installed */
-#undef HAVE_LIBLCMS2
-/* #define HAVE_LIBLCMS2 1 */
-
-/* define to 1 if you have both libpng and png.h installed */
-#undef HAVE_LIBPNG
-/* #define HAVE_LIBPNG 1 */
-
-/* define to 1 if you have both libtiff and tiff.h installed */
-#undef HAVE_LIBTIFF
-/* #define HAVE_LIBTIFF 1 */
-
-/*---------------- DO NOT CHANGE BELOW THIS LINE ----------------*/
-#define PACKAGE_URL "http://www.openjpeg.org/"
-#define PACKAGE_BUGREPORT "http://code.google.com/p/openjpeg/"
-
-#define PACKAGE_VERSION "1.4.0"
diff --git a/win32/slimftmodules.h b/win32/slimftmodules.h
deleted file mode 100644
index 96e87d8d..00000000
--- a/win32/slimftmodules.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* custom ftmodule.h which selects the minimum features required by mupdf */
-
-// FT_USE_MODULE( FT_Module_Class, autofit_module_class )
-FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
-// FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
-// FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
-// FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
-// FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
-FT_USE_MODULE( FT_Module_Class, psaux_module_class )
-FT_USE_MODULE( FT_Module_Class, psnames_module_class )
-// FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
-// FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
-FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
-// FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
-// FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
-// FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
diff --git a/win32/slimftoptions.h b/win32/slimftoptions.h
deleted file mode 100644
index 066ee377..00000000
--- a/win32/slimftoptions.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* custom ftoption.h which selects the minimum features needed by mupdf */
-
-#include <freetype/config/ftoption.h>
-#undef FT_CONFIG_OPTION_USE_LZW
-#undef FT_CONFIG_OPTION_USE_ZLIB
-#undef FT_CONFIG_OPTION_MAC_FONTS
-#undef FT_CONFIG_OPTION_INCREMENTAL
-#undef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-#undef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-#undef TT_CONFIG_OPTION_BDF
-#undef T1_CONFIG_OPTION_NO_AFM
-#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-
-#undef FT_CONFIG_OPTION_OLD_INTERNALS