Commits

Anonymous committed 5796fa1

Fix built for Win32 targets.

Comments (0)

Files changed (4)

config/config_win.py

 def update_sys_deps (deps):
     deps["user32"] = Dependency ([], 'user32')
     deps["user32"].nocheck = True
-    deps["gdi32"] = Dependency ([], 'user32')
+    deps["gdi32"] = Dependency ([], 'gdi32')
     deps["gdi32"].nocheck = True
 
 def add_sys_deps (module):
 
     incfile = "%s.h" % docfile.replace (".xml", "_doc")
     docpath = os.path.join ("doc", "src")
-    
     create_cref.create_c_header (os.path.join (docpath, docfile),
                                  os.path.join (docincpath, incfile))
 
     docincpath = os.path.join ("src", "doc")
     if not os.path.exists (docincpath):
         os.mkdir (docincpath)
-        for ext in ext_modules:
-            modules.create_docheader (ext.basemodule, docincpath)
+    for ext in ext_modules:
+        modules.create_docheader (ext.basemodule, docincpath)
 
     setupdata = {
         "cmdclass" : { "install_data" : SmartInstallData },

src/freetype/ft_wrap.c

 const char *
 PGFT_Face_GetFormat(PyFreeTypeFont *font)
 {
-    /* 
-     * Disregard the X11, this function is portable
-     * across all supported platforms
-     */
-    return FT_Get_X11_Font_Format(font->face); 
+#ifdef HAS_X11
+    return FT_Get_X11_Font_Format(font->face);
+#else
+    return ""; /* FIXME: Find a portable solution for native Win32 freetype */
+#endif
 }
 
 int