From 5fe4c00ed29e6d85f348a79d2dfd9ea8f9a88b27 Mon Sep 17 00:00:00 2001
From: David Turner <david@freetype.org>
Date: Wed, 26 Jul 2000 19:04:08 +0000
Subject: [PATCH] - fixed the incorrect SO extension for Visual C++ - disabled
 the TrueType interpreter by default - disabled the "type1" driver, "type1z"
 is now used   by default (the internal driver name is "type1" now !!)

---
 CHANGES                             | 6 ++++++
 builds/win32/w32-vcc.mk             | 2 +-
 include/freetype/config/ftmodule.h  | 1 -
 include/freetype/config/ftoption.h  | 2 +-
 src/truetype/ttdriver.c             | 4 ++++
 src/truetype/ttgload.c              | 4 +++-
 src/type1/{module.mk => module.mk0} | 0
 src/type1/{rules.mk => rules.mk0}   | 0
 src/type1z/module.mk                | 8 ++++----
 src/type1z/z1driver.c               | 4 ++--
 src/type1z/z1driver.h               | 2 +-
 11 files changed, 22 insertions(+), 11 deletions(-)
 rename src/type1/{module.mk => module.mk0} (100%)
 rename src/type1/{rules.mk => rules.mk0} (100%)

diff --git a/CHANGES b/CHANGES
index 70031619c..44bdb3e05 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 LATEST CHANGES
 
+  - updates to the build system. We now compile the library correctly
+    under Unix system through "configure" which is automatically called
+    on the first "make" invocation.
+    
+  - added the auto-hinting module !!. Fixing some bugs here and there..
+
   - found some bugs in the composite loader (seac) of the Type1-based
     font drivers..
 
diff --git a/builds/win32/w32-vcc.mk b/builds/win32/w32-vcc.mk
index d28d71033..955f44a82 100644
--- a/builds/win32/w32-vcc.mk
+++ b/builds/win32/w32-vcc.mk
@@ -49,7 +49,7 @@ LIB_DIR := $(OBJ_DIR)
 # .o, .tco, .obj, etc., depending on the platform.
 #
 O  := obj
-SO := ojc
+SO := obj
 
 # The library file extension (for standard and static libraries).  This can
 # be .a, .lib, etc., depending on the platform.
diff --git a/include/freetype/config/ftmodule.h b/include/freetype/config/ftmodule.h
index 88c72e282..50cc46b5c 100644
--- a/include/freetype/config/ftmodule.h
+++ b/include/freetype/config/ftmodule.h
@@ -7,5 +7,4 @@ FT_USE_MODULE(sfnt_module_class)
 FT_USE_MODULE(ft_smooth_renderer_class)
 FT_USE_MODULE(tt_driver_class)
 FT_USE_MODULE(t1_driver_class)
-FT_USE_MODULE(t1z_driver_class)
 FT_USE_MODULE(winfnt_driver_class)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 20edaf51c..a7e1f406a 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -305,7 +305,7 @@
   /* By undefining this, you will only compile the code necessary to load  */
   /* TrueType glyphs without hinting.                                      */
   /*                                                                       */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 7b7c45cd5..0b3cb480c 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -435,7 +435,11 @@
     {
       ft_module_font_driver     |
       ft_module_driver_scalable |
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
       ft_module_driver_has_hinter,
+#else
+      0,
+#endif            
 
       sizeof ( TT_DriverRec ),
 
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index eeb2ae409..e9b87fa67 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -639,7 +639,9 @@
       load->pp2 = zone->cur[n_points - 1];
     }
 
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
   Exit:
+#endif  
     return error;
   }
 
@@ -796,7 +798,7 @@
 
 #else
 
-      error = Process_Simple_Glyph( loader, 0 );
+      error = TT_Process_Simple_Glyph( loader, 0 );
 
 #endif
 
diff --git a/src/type1/module.mk b/src/type1/module.mk0
similarity index 100%
rename from src/type1/module.mk
rename to src/type1/module.mk0
diff --git a/src/type1/rules.mk b/src/type1/rules.mk0
similarity index 100%
rename from src/type1/rules.mk
rename to src/type1/rules.mk0
diff --git a/src/type1z/module.mk b/src/type1z/module.mk
index 64283af62..545887d82 100644
--- a/src/type1z/module.mk
+++ b/src/type1z/module.mk
@@ -1,7 +1,7 @@
-make_module_list: add_type1z_driver
+make_module_list: add_type1_driver
 
-add_type1z_driver:
-	$(OPEN_DRIVER)t1z_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)type1z    $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
+add_type1_driver:
+	$(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER)
+	$(ECHO_DRIVER)type1     $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
 
 # EOF
diff --git a/src/type1z/z1driver.c b/src/type1z/z1driver.c
index 59e468643..aea2c10f1 100644
--- a/src/type1z/z1driver.c
+++ b/src/type1z/z1driver.c
@@ -283,13 +283,13 @@
   }
 
 
-  const FT_Driver_Class  t1z_driver_class =
+  const FT_Driver_Class  t1_driver_class =
   {
     {
       ft_module_font_driver | ft_module_driver_scalable,
       sizeof( FT_DriverRec ),
 
-      "type1z",
+      "type1",
       0x10000L,
       0x20000L,
 
diff --git a/src/type1z/z1driver.h b/src/type1z/z1driver.h
index 444a2e126..08bd544d5 100644
--- a/src/type1z/z1driver.h
+++ b/src/type1z/z1driver.h
@@ -21,7 +21,7 @@
 
 #include <freetype/internal/ftdriver.h>
 
-  FT_EXPORT_VAR( const  FT_Driver_Class )  t1z_driver_class;
+  FT_EXPORT_VAR( const  FT_Driver_Class )  t1_driver_class;
 
 #endif /* Z1DRIVER_H */