r18086 by jghali - some cleanups : remove unnecessary cmake defines, clean up win-config.h, remove some now unused win32 specific source files

Sat Jan 12 14:42:56 UTC 2013

Author: jghali
Date: Sat Jan 12 14:42:56 2013
New Revision: 18086

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18086
Log:
some cleanups : remove unnecessary cmake defines, clean up win-config.h, remove some now unused win32 specific source files

Modified:
    trunk/Scribus/config.h.cmake
    trunk/Scribus/scribus/scpainterex_gdi.cpp
    trunk/Scribus/scribus/scpainterex_gdi.h
    trunk/Scribus/scribus/scpainterex_gdiplus.cpp
    trunk/Scribus/scribus/scpainterex_gdiplus.h
    trunk/Scribus/win32/vc9/win-config.h

Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18086&path=/trunk/Scribus/config.h.cmake
==============================================================================

--- trunk/Scribus/config.h.cmake (original)
+++ trunk/Scribus/config.h.cmake Sat Jan 12 14:42:56 2013
@@ -12,8 +12,6 @@
 #cmakedefine VERSION "1.5.0.svn"
 
 #cmakedefine BUILD_WINDOWS_VERSION 1
-#cmakedefine SC_USE_GDI 1
-#cmakedefine SC_USE_GDIPLUS 1
 #cmakedefine DLL_USE_NATIVE_API 1
 #cmakedefine BUILD_MAC_BUNDLE
 #cmakedefine HAVE_CMS 1

Modified: trunk/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18086&path=/trunk/Scribus/win32/vc9/win-config.h
==============================================================================
--- trunk/Scribus/win32/vc9/win-config.h (original)
+++ trunk/Scribus/win32/vc9/win-config.h Sat Jan 12 14:42:56 2013
@@ -1,5 +1,8 @@
 #ifndef WINCONFIG_H
 #define WINCONFIG_H
+
+/* Version number of package */
+#define VERSION "1.5.0svn"
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1
@@ -11,7 +14,7 @@
 #undef BUILD_MAC_BUNDLE
 
 /* ColorManagementInclude */
-#define CMS_INC "lcms.h"
+#define CMS_INC "lcms2.h"
 
 /* ColorManagement (LittleCms) */
 #define HAVE_CMS 1
@@ -25,47 +28,23 @@
 /* Can we use unicode functions (Windows) */
 #define HAVE_UNICODE 1
 
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#undef HAVE_CRT_EXTERNS_H
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
 /* Cups */
 #undef HAVE_CUPS
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Defines if your system has the cairo library */
+#define HAVE_CAIRO 1
+
+/* Defines if your system has the boost libraries */
+#define HAVE_BOOST 1
+
 /* Defines if your system has the libfontconfig library */
 #undef HAVE_FONTCONFIG
 
-/* Defines if your system has the libfreetype library */
-#define HAVE_FREETYPE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Defines if your system has the cairo library */
-#define HAVE_CAIRO 1
-
-/* Define if you have libjpeg */
-#define HAVE_LIBJPEG 1
-
-/* Define if you have libpng */
-#define HAVE_LIBPNG 1
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
 /* Define if you have libz */
 #define HAVE_LIBZ 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
 
 /* Define if you have the development files for podofo */
 #define HAVE_PODOFO 1
@@ -75,12 +54,6 @@
 
 /* Define if you have the development files for python */
 #define HAVE_PYTHON 1
-
-/* Python */
-#undef HAVE_PYTHON_23
-
-/* Define if you have the res_init function */
-#undef HAVE_RES_INIT
 
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
@@ -94,27 +67,6 @@
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 // #define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
@@ -137,29 +89,8 @@
 /* Defines if your system has the libxml2 library6 */
 #define HAVE_XML26 1
 
-/* The size of a `char *', as computed by sizeof. */
-#define SIZEOF_CHAR_P 4
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of a `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2 
-
-/* The size of a `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
-
-/* The size of a `unsigned long', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG 4
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.5.0svn"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */


