[grisbi-cvs] grisbi/win32-msvc CMakeLists.txt, 1.6, 1.7 config.h, 1.1, 1.2
Mickaël Remars
mykeul at users.sourceforge.net
Tue Aug 25 12:31:51 CEST 2009
Update of /cvsroot/grisbi/grisbi/win32-msvc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7291
Modified Files:
CMakeLists.txt config.h
Log Message:
Moved most of the #define from config.h to definitions in CMakeLists.txt
Index: config.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.h 25 Aug 2009 08:22:41 -0000 1.1
+++ config.h 25 Aug 2009 10:31:49 -0000 1.2
@@ -1,82 +1,9 @@
-/* ************************************************************************** */
-/* This file is generated by autogen script , please do not modify it, */
-/* your modification will be lost */
-/* Copyright (C) 2004- Francois Terrot (francois.terrot at grisbi.org) */
-/* http://www.grisbi.org */
-/* */
-/* This program is free software; you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation; either version 2 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program 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 General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program; if not, write to the Free Software */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-/* */
-/* ************************************************************************** */
-#ifndef _WIN32_CONFIG_H
-#define _WIN32_CONFIG_H
-
-#ifdef _WIN32
-
-#define VERSION "0.6.0-grisbi for Windows (GTK 2.12.9)"
-#define PACKAGE "grisbi"
-
-/* Define to 1 if translation of program messages to the user's native
- language is requested. */
-#define ENABLE_NLS 1
-
-/* Define if you have the iconv() function. */
-#define HAVE_ICONV 1
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if you have the `intl' library (-lintl). */
-#define HAVE_LIBINTL 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mempcpy' function. */
-#define HAVE_MEMPCPY 1
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 to have OFX support disabled */
-#define NOOFX 1
-
-/* Define to 1 if you want to have OFX support using libofx 0.7.0 */
-#define OFX_0_7 1
-
-/* Define to 1 when you do not want to use SSL as crypt algorithm (NOT RECOMMANDED) */
-#undef NOSSL
+#ifndef _WIN32_MSVC_CONFIG_H
+#define _WIN32_MSVC_CONFIG_H
-/* Define to 1 to have grisbi plugins management system activated */
-#define HAVE_PLUGINS 1
+#define VERSION "0.6.0-grisbi for Windows (GTK 2.12.9)"
+#define PACKAGE "grisbi"
#include "win32utils.h"
-#endif // _WIN32
-#endif // !_WIN32_CONFIG_H
-
-/* vim:ft=c
- * */
+#endif // !_WIN32_MSVC_CONFIG_H
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CMakeLists.txt 25 Aug 2009 09:49:25 -0000 1.6
+++ CMakeLists.txt 25 Aug 2009 10:31:49 -0000 1.7
@@ -2,12 +2,59 @@
SET(EXECUTABLE_OUTPUT_PATH target)
+
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-ADD_DEFINITIONS(-DHAVE_STRING_H)
-ADD_DEFINITIONS(-DNOSSL)
ADD_DEFINITIONS(-D__PRETTY_FUNCTION__="")
ADD_DEFINITIONS(-D_WIN32)
+# Define to 1 if translation of program messages to the user's native language is requested.
+ADD_DEFINITIONS(-DENABLE_NLS=1)
+
+# Define if you have the iconv() function.
+ADD_DEFINITIONS(-DHAVE_ICONV=1)
+
+# Define if you have <langinfo.h> and nl_langinfo(CODESET).
+ADD_DEFINITIONS(-DHAVE_LANGINFO_CODESET=1)
+
+# Define if your <locale.h> file defines LC_MESSAGES.
+ADD_DEFINITIONS(-DHAVE_LC_MESSAGES=1)
+
+# Define to 1 if you have the `intl' library (-lintl).
+ADD_DEFINITIONS(-DHAVE_LIBINTL=1)
+
+# Define to 1 if you have the <limits.h> header file.
+ADD_DEFINITIONS(-DHAVE_LIMITS_H=1)
+
+# Define to 1 if you have the <locale.h> header file.
+ADD_DEFINITIONS(-DHAVE_LOCALE_H=1)
+
+# Define to 1 if you have the <malloc.h> header file.
+ADD_DEFINITIONS(-DHAVE_MALLOC_H=1)
+
+# Define to 1 if you have the <memory.h> header file.
+ADD_DEFINITIONS(-DHAVE_MEMORY_H=1)
+
+# Define to 1 if you have the `mempcpy' function.
+ADD_DEFINITIONS(-DHAVE_MEMPCPY=1)
+
+# Define to 1 to have grisbi plugins management system activated
+ADD_DEFINITIONS(-DHAVE_PLUGINS=1)
+
+# Define to 1 if you have the `setlocale' function.
+ADD_DEFINITIONS(-DHAVE_SETLOCALE=1)
+
+# Define to 1 if you have the <string.h> header file.
+ADD_DEFINITIONS(-DHAVE_STRING_H=1)
+
+# Define to 1 to have OFX support disabled
+ADD_DEFINITIONS(-DNOOFX=1)
+# Define to 1 if you want to have OFX support using libofx 0.7.0
+ADD_DEFINITIONS(-DOFX_0_7=1)
+
+# Define to 1 when you do not want to use SSL as crypt algorithm (NOT RECOMMANDED)
+#ADD_DEFINITIONS(-DNOSSL=1)
+
+
INCLUDE_DIRECTORIES(
target/gtk-dev/include/atk-1.0
target/gtk-dev/include/cairo
@@ -314,6 +361,7 @@
../win32-msvc/src/getopt1.c
../win32-msvc/src/realpath.c
../win32-msvc/src/realpath.h
+ ../win32-msvc/config.h
../win32/win32gtkutils.c
../win32/win32gtkutils.h
../win32/win32utils.c
More information about the cvs
mailing list