mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Compile genesys_devices.cc as a separate translation unit

merge-requests/124/head
Povilas Kanapickas 2019-08-04 18:21:06 +03:00
rodzic 7159bbee32
commit 6592692448
4 zmienionych plików z 9 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
backend/Makefile.am
Wyświetl plik

@ -484,6 +484,7 @@ libgenesys_la_SOURCES = genesys.cc genesys.h \
genesys_buffer.h genesys_buffer.cc \
genesys_calibration.h \
genesys_device.h genesys_device.cc \
genesys_devices.cc \
genesys_enums.h \
genesys_error.h genesys_error.cc \
genesys_gl646.cc genesys_gl646.h genesys_gl841.cc genesys_gl841.h \
@ -505,7 +506,7 @@ libsane_genesys_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_genesys_la_LIBADD = $(COMMON_LIBS) libgenesys.la ../sanei/sanei_magic.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
EXTRA_DIST += genesys.conf.in
# TODO: Why are this distributed but not compiled?
EXTRA_DIST += genesys_conv.cc genesys_conv_hlp.cc genesys_devices.cc
EXTRA_DIST += genesys_conv.cc genesys_conv_hlp.cc
libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) $(GPHOTO2_CPPFLAGS) -DBACKEND_NAME=gphoto2

1
backend/genesys.cc
Wyświetl plik

@ -64,7 +64,6 @@
#include "genesys_sanei.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_magic.h"
#include "genesys_devices.cc"
#include <cstdio>
#include <cstring>

2
backend/genesys_devices.cc
Wyświetl plik

@ -55,6 +55,8 @@
/* Some setup DAC and CCD tables */
/* ------------------------------------------------------------------------ */
#define DEBUG_DECLARE_ONLY
#include "genesys_low.h"
StaticInit<std::vector<Genesys_Frontend>> s_frontends;

5
backend/genesys_low.h
Wyświetl plik

@ -669,6 +669,11 @@ private:
};
extern StaticInit<std::vector<Genesys_Sensor>> s_sensors;
extern StaticInit<std::vector<Genesys_Frontend>> s_frontends;
extern StaticInit<std::vector<Genesys_Gpo>> s_gpo;
extern StaticInit<std::vector<Genesys_Motor>> s_motors;
extern StaticInit<std::vector<Genesys_USB_Device_Entry>> s_usb_devices;
void genesys_init_sensor_tables();
void genesys_init_frontend_tables();
void genesys_init_gpo_tables();