[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd configure configure.in build/vc2008/conf...
|
From: |
Edward Rosten |
|
Subject: |
[libcvd-members] libcvd configure configure.in build/vc2008/conf... |
|
Date: |
Mon, 16 May 2011 10:50:32 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 11/05/16 10:50:31
Modified files:
. : configure configure.in
build/vc2008 : config-TooN-JPEG-pthread.h config-TooN.h
libcvd-TooN-JPEG-pthread.vcproj
libcvd-TooN.vcproj
Added files:
cvd/internal : win.h
Log message:
Include useful #defines in Windows config to prevent warnings and macro
clashes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/config-TooN-JPEG-pthread.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/config-TooN.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd-TooN-JPEG-pthread.vcproj?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd-TooN.vcproj?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/win.h?cvsroot=libcvd&rev=1.1
Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- configure 13 May 2011 09:56:52 -0000 1.162
+++ configure 16 May 2011 10:50:29 -0000 1.163
@@ -13071,7 +13071,11 @@
cat << FOO > cvd/config_tmp.h
#ifndef CVD_CONFIG_H
#define CVD_CONFIG_H
+#ifdef WIN32
+ #include <cvd/internal/win.h>
+#endif
FOO
+
echo '#define CVD_HAVE_CPU_'$host_cpu 1 | cat - confdefs.h | grep CVD_ | sort
| sed 's/#define CVD_.*HAVE_\(.*\) .*/#ifndef CVD_DISABLE_\1\
&\
#endif/' >> cvd/config_tmp.h
Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- configure.in 13 May 2011 09:56:52 -0000 1.163
+++ configure.in 16 May 2011 10:50:31 -0000 1.164
@@ -1139,7 +1139,11 @@
cat << FOO > cvd/config_tmp.h
#ifndef CVD_CONFIG_H
#define CVD_CONFIG_H
+#ifdef WIN32
+ #include <cvd/internal/win.h>
+#endif
FOO
+
echo '#define CVD_HAVE_CPU_'$host_cpu 1 | cat - confdefs.h | grep CVD_ | sort
| sed 's/#define CVD_.*HAVE_\(.*\) .*/#ifndef CVD_DISABLE_\1\
&\
#endif/' >> cvd/config_tmp.h
Index: build/vc2008/config-TooN-JPEG-pthread.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/config-TooN-JPEG-pthread.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/config-TooN-JPEG-pthread.h 13 May 2011 09:56:52 -0000
1.1
+++ build/vc2008/config-TooN-JPEG-pthread.h 16 May 2011 10:50:31 -0000
1.2
@@ -1,5 +1,8 @@
#ifndef CVD_CONFIG_H
#define CVD_CONFIG_H
+#ifdef WIN32
+ #include <cvd/internal/win.h>
+#endif
#define CVD_ARCH_LITTLE_ENDIAN 1
#ifndef CVD_DISABLE_CPU_x86_64
#define CVD_HAVE_CPU_x86_64 1
Index: build/vc2008/config-TooN.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/config-TooN.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/config-TooN.h 13 May 2011 09:56:52 -0000 1.1
+++ build/vc2008/config-TooN.h 16 May 2011 10:50:31 -0000 1.2
@@ -1,5 +1,8 @@
#ifndef CVD_CONFIG_H
#define CVD_CONFIG_H
+#ifdef WIN32
+ #include <cvd/internal/win.h>
+#endif
#define CVD_ARCH_LITTLE_ENDIAN 1
#ifndef CVD_DISABLE_CPU_x86_64
#define CVD_HAVE_CPU_x86_64 1
Index: build/vc2008/libcvd-TooN-JPEG-pthread.vcproj
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/libcvd-TooN-JPEG-pthread.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/libcvd-TooN-JPEG-pthread.vcproj 13 May 2011 09:56:52
-0000 1.1
+++ build/vc2008/libcvd-TooN-JPEG-pthread.vcproj 16 May 2011 10:50:31
-0000 1.2
@@ -949,6 +949,10 @@
RelativePath="..\..\cvd\internal\io\tiff.h"
>
</File>
+ <File
+ RelativePath="..\..\cvd\internal\win.h"
+ >
+ </File>
</Filter>
</Filter>
</Files>
Index: build/vc2008/libcvd-TooN.vcproj
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2008/libcvd-TooN.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/libcvd-TooN.vcproj 13 May 2011 09:56:52 -0000 1.1
+++ build/vc2008/libcvd-TooN.vcproj 16 May 2011 10:50:31 -0000 1.2
@@ -945,6 +945,10 @@
RelativePath="..\..\cvd\internal\io\tiff.h"
>
</File>
+ <File
+ RelativePath="..\..\cvd\internal\win.h"
+ >
+ </File>
</Filter>
</Filter>
</Files>
Index: cvd/internal/win.h
===================================================================
RCS file: cvd/internal/win.h
diff -N cvd/internal/win.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cvd/internal/win.h 16 May 2011 10:50:31 -0000 1.1
@@ -0,0 +1,28 @@
+#ifndef CVD_INC_INTERNAL_WIN_H
+#define CVD_INC_INTERNAL_WIN_H
+
+ // make sure to have all necessary definitions included, this requires
min Windows 2000
+ #define _WIN32_WINNT 0x0500
+
+ // missing C99 define (C99 not supported in VC++)
+ typedef __int32 int32_t;
+
+ // avoid warnings about using old unsave versions of libc functions
+ #ifndef _CRT_SECURE_NO_WARNINGS
+ #define _CRT_SECURE_NO_WARNINGS
+ #endif
+
+ // avoid warnings about checked/unchecked iterators
+ #ifndef _SCL_SECURE_NO_WARNINGS
+ #define _SCL_SECURE_NO_WARNINGS
+ #endif
+
+ // to get M_PI, etc.
+ #define _USE_MATH_DEFINES
+
+ // don't include garbage
+ #define WINDOWS_LEAN_AND_MEAN
+
+ // don't define macros for min, max
+ #define NOMINMAX
+#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd configure configure.in build/vc2008/conf...,
Edward Rosten <=