Revision: 42396
http://brlcad.svn.sourceforge.net/brlcad/?rev=42396&view=rev
Author: starseeker
Date: 2011-01-17 14:49:43 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Add a config_win header that will work with cmake - for now this looks like the
simplest way to make both systems happy, but eventually config_win_cmake.h will
become config_win.h
Modified Paths:
--------------
brlcad/trunk/include/Makefile.am
Added Paths:
-----------
brlcad/trunk/include/config_win_cmake.h
Modified: brlcad/trunk/include/Makefile.am
===================================================================
--- brlcad/trunk/include/Makefile.am 2011-01-17 14:38:14 UTC (rev 42395)
+++ brlcad/trunk/include/Makefile.am 2011-01-17 14:49:43 UTC (rev 42396)
@@ -84,7 +84,8 @@
sysv.h
EXTRA_DIST = \
- sed4
+ sed4 \
+ config_win_cmake.h
if ONLY_BENCHMARK
brlcadinclude_HEADERS = $(brlcadinclude_required)
Added: brlcad/trunk/include/config_win_cmake.h
===================================================================
--- brlcad/trunk/include/config_win_cmake.h (rev 0)
+++ brlcad/trunk/include/config_win_cmake.h 2011-01-17 14:49:43 UTC (rev
42396)
@@ -0,0 +1,310 @@
+/* C O N F I G _ W I N . H
+ * BRL-CAD
+ *
+ * Copyright (c) 1993-2011 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @addtogroup fixme */
+/** @{ */
+/** @file config_win.h
+ *
+ * This file is used for compilation on the Windows platform in place
+ * of using the auto-generated brlcad_config.h header.
+ *
+ */
+
+#ifndef IGNORE_CONFIG_H
+#if defined(_WIN32)
+
+/* !!! this should not be here, should fix the build system settings */
+#define __STDC__ 1
+
+/* 4127 conditional expression is constant
+ * 4244 conversion from type 1 to type 2
+ * 4305 truncation
+ * 4312 type cast: conversion from type1 to type2 of greater size
+ * 4018 signed/unsigned mismatch
+ * 4996 deprecation warning on non-secure functions
+ */
+#pragma warning( disable : 4127 4244 4312 4996 )
+/* #pragma warning( disable : 4244 4305 4018) */
+
+/*
+ * Ensure that Project Settings / Project Options includes
+ * /Za for ANSI C
+ */
+# if !__STDC__
+# error "STDC is not properly set on WIN32 build, add /Za to Project
Settings / Project Options"
+# endif
+
+#ifndef EXPAND_IN_STRING
+# define EXPAND_IN_STRING(x) EXPAND_IN_STRING_INTERN(x)
+# define EXPAND_IN_STRING_INTERN(x) #x
+#endif
+
+/*
+ * declare results of configure tests
+ */
+
+#define HAS_OPENGL 1
+#define HAVE_FCNTL_H 1
+#define HAVE_PUTENV 1
+#define HAVE_GETHOSTNAME 1
+#define HAVE_GETPROGNAME 1
+#define HAVE_GL_GL_H 1
+#define HAVE_IO_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MEMSET 1
+#define HAVE_OFF_T 1
+#define HAVE_PROCESS_H 1
+#define HAVE_REGEX_H 1
+#define HAVE_SIG_T 1
+#define HAVE_STRCHR 1
+#define HAVE_STRDUP 1
+#define HAVE_STRDUP_DECL 1
+#define HAVE_STRTOK 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_TIME 1
+#define HAVE_VFORK 1
+#define HAVE_WINSOCK_H 1
+#define HAVE_WINSOCK2_H 1
+
+#define HAVE_SBRK 1
+#define sbrk(i) (NULL)
+
+#define fb_log bu_log
+
+#define HAVE_TK 1
+#define HAVE_X11_TYPES 1
+
+#define YY_NO_UNISTD_H 1
+#define YYTOKENTYPE 1
+
+/*
+ * functions declared in io.h
+ */
+
+#define access _access
+#define chmod _chmod
+#define chsize _chsize
+#define close _close
+#define commit _commit
+#define creat _creat
+#define dup _dup
+#define dup2 _dup2
+#if 0
+#define eof _eof
+#endif
+/* #define filelength _filelength */
+#define isatty _isatty
+#define locking _locking
+#define lseek _lseek
+/* #define mktemp _mktemp */
+#define open _open
+#define unlink _unlink
+/* why not just #define pipe _pipe? */
+#define pipe(_FD) (_pipe((_FD), 256, _O_TEXT))
+#define read _read
+#define setmode _setmode
+/* #define tell _tell */
+#define umask _umask
+#define write _write
+
+/*
+ * other functions declared elsewhere (many in stdio.h)
+ */
+
+#define isnan _isnan
+#define execvp _execvp
+#define fdopen _fdopen
+#define fileno _fileno
+#define fstat _fstat
+#define getpid _getpid
+#define hypot _hypot
+#define isascii __isascii
+#define pclose _pclose
+#define popen _popen
+#define putenv _putenv
+#define snprintf _snprintf
+#define snprintf _snprintf
+#define sopen _sopen
+#define stat _stat
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#define strdup _strdup
+#define sys_errlist _sys_errlist
+#define sys_nerr _sys_nerr
+
+#define fmax __max
+#define ioctl ioctlsocket
+
+#define SHARED_PTR_BOOST 1
+
+/*
+ * Signal handling
+ */
+
+typedef void (*sig_t)(int);
+
+/*
+ * types
+ */
+
+#define off_t _off_t
+
+typedef int pid_t;
+typedef int socklen_t;
+typedef unsigned int gid_t;
+typedef unsigned int uid_t;
+
+
+/*
+ * for chmod()
+ */
+
+#ifndef S_IFMT
+# define S_IFMT _S_IFMT
+#endif
+#ifndef S_IFDIR
+# define S_IFDIR _S_IFDIR
+#endif
+#ifndef S_IFCHR
+# define S_IFCHR _S_IFCHR
+#endif
+#ifndef S_IFREG
+# define S_IFREG _S_IFREG
+#endif
+
+#ifndef S_IREAD
+# define S_IREAD _S_IREAD
+#endif
+#ifndef S_IWRITE
+# define S_IWRITE _S_IWRITE
+#endif
+#ifndef S_IEXEC
+# define S_IEXEC _S_IEXEC
+#endif
+
+#ifndef S_IRUSR
+# define S_IRUSR S_IREAD
+#endif
+#ifndef S_IWUSR
+# define S_IWUSR S_IWRITE
+#endif
+#ifndef S_IXUSR
+# define S_IXUSR S_IEXEC
+#endif
+
+#ifndef S_IRGRP
+# define S_IRGRP ((S_IRUSR)>>3)
+#endif
+#ifndef S_IWGRP
+# define S_IWGRP ((S_IWUSR)>>3)
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP ((S_IXUSR)>>3)
+#endif
+#ifndef S_IROTH
+# define S_IROTH ((S_IRUSR)>>6)
+#endif
+#ifndef S_IWOTH
+# define S_IWOTH ((S_IWUSR)>>6)
+#endif
+#ifndef S_IXOTH
+# define S_IXOTH ((S_IXUSR)>>6)
+#endif
+
+/*
+ * for open()
+ */
+
+#define O_APPEND _O_APPEND
+#define O_BINARY _O_BINARY
+#define O_CREAT _O_CREAT
+#define O_EXCL _O_EXCL
+#define O_RDONLY _O_RDONLY
+#define O_RDWR _O_RDWR
+#define O_TRUNC _O_TRUNC
+#define O_WRONLY _O_WRONLY
+
+/*
+ * for access()
+ */
+
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#define F_OK 0
+
+/*
+ * faking it
+ */
+
+#define fork() -1
+#define getprogname() _pgmptr
+#define rint(_X) (floor((_X) + 0.5))
+#define sleep(_SECONDS) (Sleep(1000 * (_SECONDS)))
+
+#ifndef __cplusplus
+/* Microsoft specific inline specifier */
+# define inline __inline
+#endif /* not __cplusplus */
+
+/*
+ * defines for stdin/stdout/stderr file numbers
+ */
+
+#ifndef STDIN_FILENO
+# ifdef _STDIN_FILENO
+# define STDIN_FILENO _STDIN_FILENO
+# endif
+#endif
+#ifndef STDIN_FILENO
+# define STDIN_FILENO _fileno(stdin)
+#endif
+
+#ifndef STDOUT_FILENO
+# ifdef _STDOUT_FILENO
+# define STDOUT_FILENO _STDOUT_FILENO
+# endif
+#endif
+#ifndef STDOUT_FILENO
+# define STDOUT_FILENO _fileno(stdout)
+#endif
+
+#ifndef STDERR_FILENO
+# ifdef _STDERR_FILENO
+# define STDERR_FILENO _STDERR_FILENO
+# endif
+#endif
+#ifndef STDERR_FILENO
+# define STDERR_FILENO _fileno(stderr)
+#endif
+
+#endif /* if defined(_WIN32) */
+#endif /* ifndef IGNORE_CONFIG_H */
+
+/** @} */
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/include/config_win_cmake.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
