Author: abrander
Date: 2010-05-26 17:35:27 +0200 (Wed, 26 May 2010)
New Revision: 3378
Modified:
trunk/librawstudio/Makefile.am
trunk/librawstudio/conf_interface.c
trunk/src/Makefile.am
Log:
Added GCONF define to librawstudio.
Modified: trunk/librawstudio/Makefile.am
===================================================================
--- trunk/librawstudio/Makefile.am 2010-05-26 14:40:07 UTC (rev 3377)
+++ trunk/librawstudio/Makefile.am 2010-05-26 15:35:27 UTC (rev 3378)
@@ -2,6 +2,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
+ -DWITH_GCONF \
$(GTK_CFLAGS)
INCLUDES = \
Modified: trunk/librawstudio/conf_interface.c
===================================================================
--- trunk/librawstudio/conf_interface.c 2010-05-26 14:40:07 UTC (rev 3377)
+++ trunk/librawstudio/conf_interface.c 2010-05-26 15:35:27 UTC (rev 3378)
@@ -30,6 +30,7 @@
#ifdef WITH_GCONF
#include <gconf/gconf-client.h>
#define GCONF_PATH "/apps/rawstudio/"
+ static GStaticMutex lock = G_STATIC_MUTEX_INIT;
#else
#ifdef G_OS_WIN32
#include <windows.h>
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-05-26 14:40:07 UTC (rev 3377)
+++ trunk/src/Makefile.am 2010-05-26 15:35:27 UTC (rev 3378)
@@ -10,7 +10,6 @@
AM_CFLAGS =\
-Wall -fno-strict-aliasing\
-O4\
- -DWITH_GCONF\
-DDCRAW_NOMAIN\
-DDCRAW_NOLCMS\
-DWITH_MMAP_HACK
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
