linked libgphoto2 to libgpio.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@635 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -54,4 +54,3 @@ src/Makefile
|
||||
intl/Makefile
|
||||
po/Makefile.in
|
||||
])
|
||||
|
||||
|
||||
@@ -4,6 +4,9 @@ INCLUDES = \
|
||||
-I$(top_srcdir)/intl \
|
||||
@GTK_CFLAGS@
|
||||
|
||||
CFLAGS = @CFLAGS@ `gphoto2-config --cflags`
|
||||
LDFLAGS = @LDFLAGS@ `gphoto2-config --libs`
|
||||
|
||||
bin_PROGRAMS = gphoto2_gtk
|
||||
|
||||
gphoto2_gtk_SOURCES = \
|
||||
@@ -12,4 +15,4 @@ gphoto2_gtk_SOURCES = \
|
||||
interface.c interface.h \
|
||||
callbacks.c callbacks.h
|
||||
|
||||
gphoto2_gtk_LDADD = @GTK_LIBS@ $(INTLLIBS)
|
||||
gphoto2_gtk_LDADD = @GTK_LIBS@ $(INTLLIBS)
|
||||
|
||||
@@ -13,11 +13,33 @@
|
||||
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gphoto2.h>
|
||||
|
||||
#include "callbacks.h"
|
||||
#include "interface.h"
|
||||
#include "support.h"
|
||||
|
||||
int interface_message(char *message) {
|
||||
|
||||
return (GP_OK);
|
||||
}
|
||||
|
||||
int interface_status(char *message) {
|
||||
|
||||
return (GP_OK);
|
||||
}
|
||||
|
||||
int interface_progress(float percentage) {
|
||||
|
||||
return (GP_OK);
|
||||
}
|
||||
|
||||
int interface_confirm(char *message) {
|
||||
|
||||
return (GP_OK);
|
||||
}
|
||||
|
||||
|
||||
GtkWidget*
|
||||
create_main_window (void)
|
||||
{
|
||||
@@ -1562,4 +1584,3 @@ create_select_camera_window (void)
|
||||
|
||||
return select_camera_window;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,3 +7,8 @@ GtkWidget* create_message_window_long (void);
|
||||
GtkWidget* create_confirm_window (void);
|
||||
GtkWidget* create_message_window (void);
|
||||
GtkWidget* create_select_camera_window (void);
|
||||
|
||||
int interface_message(char *message);
|
||||
int interface_status(char *message);
|
||||
int interface_progress(float percentage);
|
||||
int interface_confirm(char *message);
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gphoto2/gphoto2.h>
|
||||
#include <gphoto2.h>
|
||||
|
||||
#include "interface.h"
|
||||
#include "support.h"
|
||||
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
|
||||
*/
|
||||
main_window = create_main_window ();
|
||||
gtk_widget_show (main_window);
|
||||
|
||||
|
||||
/*
|
||||
message_window_long = create_message_window_long ();
|
||||
gtk_widget_show (message_window_long);
|
||||
|
||||
@@ -5,8 +5,9 @@ CFLAGS= @CFLAGS@ \
|
||||
-Wall \
|
||||
-I$(top_srcdir)/include \
|
||||
-DCAMLIBS=\"$(pkglibdir)\" \
|
||||
-DDEBUG
|
||||
LDFLAGS = @LDFLAGS@ -g
|
||||
-DDEBUG \
|
||||
`gpio-config --cflags`
|
||||
LDFLAGS = @LDFLAGS@ -g `gpio-config --libs`
|
||||
|
||||
libgphoto2_la_LDFLAGS = -version-info 0:0:0
|
||||
libgphoto2_la_SOURCES = \
|
||||
|
||||
Reference in New Issue
Block a user