r18093 by jghali - msvc projetc update : small fix + update build number to 1.4.3svn

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 15 08:18:38 UTC 2013


Author: jghali
Date: Tue Jan 15 08:18:37 2013
New Revision: 18093

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18093
Log:
msvc projetc update : small fix + update build number to 1.4.3svn

Modified:
    branches/Version14x/Scribus/win32/vc9/lenseffects/lenseffects.vcproj
    branches/Version14x/Scribus/win32/vc9/win-config.h

Modified: branches/Version14x/Scribus/win32/vc9/lenseffects/lenseffects.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18093&path=/branches/Version14x/Scribus/win32/vc9/lenseffects/lenseffects.vcproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/lenseffects/lenseffects.vcproj (original)
+++ branches/Version14x/Scribus/win32/vc9/lenseffects/lenseffects.vcproj Tue Jan 15 08:18:37 2013
@@ -420,11 +420,11 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\scribus\plugins\tools\lenseffects\lenseffects.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\lenseffectsdll.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\scribus\plugins\tools\lenseffects\lenseffects.cpp"
 				>
 			</File>
 		</Filter>
@@ -471,44 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc'ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe "$(InputPath)" -o  "$(InputDir)\moc_$(InputName).cpp"&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.ex"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc'ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe "$(InputPath)" -o  "$(InputDir)\moc_$(InputName).cpp"&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.ex"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc'ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe "$(InputPath)" -o  "$(InputDir)\moc_$(InputName).cpp"&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.ex"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc'ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe "$(InputPath)" -o  "$(InputDir)\moc_$(InputName).cpp"&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.ex"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: branches/Version14x/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18093&path=/branches/Version14x/Scribus/win32/vc9/win-config.h
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/win-config.h (original)
+++ branches/Version14x/Scribus/win32/vc9/win-config.h Tue Jan 15 08:18:37 2013
@@ -1,5 +1,8 @@
 #ifndef WINCONFIG_H
 #define WINCONFIG_H
+
+/* Version number of package */
+#define VERSION "1.4.3svn"
 
 /* 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,15 +28,6 @@
 /* Can we use unicode functions (Windows) */
 #define HAVE_UNICODE 1
 
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
-
-/* 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
 
@@ -46,9 +40,6 @@
 /* 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*/
 
@@ -57,9 +48,6 @@
 
 /* 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
@@ -95,24 +83,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
 
@@ -137,50 +107,8 @@
 /* Defines if your system has the libxml2 library6 */
 #define HAVE_XML26 1
 
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* 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.4.2svn"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */




More information about the scribus-commit mailing list