diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-06-14 16:30:20 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-14 16:30:20 +0100 |
| commit | 8c1bff3a053aa3c325264db4ce2ea1691ed60594 (patch) | |
| tree | 140962a0e651b488d2a4db342aaac9ea8188d2f1 /scp2 | |
| parent | e5e55a0e9000aa3e5ea2a8ec5a599eb455ea7957 (diff) | |
more configure, and scp2 pieces for gtk3 integration
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/gnome/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk index 581aae447..43c244069 100644 --- a/scp2/source/gnome/makefile.mk +++ b/scp2/source/gnome/makefile.mk @@ -61,6 +61,10 @@ SCPDEFS+=-DENABLE_GNOMEVFS SCPDEFS+=-DENABLE_GIO .ENDIF +.IF "$(ENABLE_GTK3)" != "" +SCPDEFS+=-DENABLE_GTK3 +.ENDIF + PARFILES = \ module_gnome.par \ file_gnome.par diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 5572a26a6..8b8491617 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -44,6 +44,9 @@ Module gid_Module_Optional_Gnome gid_File_Lib_Evoab_2, gid_File_Lib_Fps_Gnome, gid_File_Lib_Vclplug_Gtk, +#ifdef ENABLE_GTK3 + gid_File_Lib_Vclplug_Gtk3, +#endif gid_File_Bin_Gnome_Open_Url, gid_File_Bin_Gnome_Open_Url_Bin, #ifdef ENABLE_SYSTRAY_GTK diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 125a50c5c..27bc0cb44 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1052,6 +1052,14 @@ File gid_File_Lib_Vclplug_Gtk Dir = SCP2_OOO_BIN_DIR; End #endif +#ifdef ENABLE_GTK3 +File gid_File_Lib_Vclplug_Gtk3 + Name = LIBNAME(vclplug_gtk3); + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; +End +#endif #ifdef ENABLE_KDE #ifndef MACOSX File gid_File_Lib_Vclplug_Kde |