darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make build work on OS/2 again no library files touched in the end

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1363 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
bvl
2000-11-30 22:59:58 +00:00
parent ce87cee0c4
commit e48b3e7e68
8 changed files with 1163 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/barbie/makefile.os2
View File

@@ -28,5 +28,5 @@ barbie.def: barbie.o
@copy barbie.df barbie.def
@emxexp $** >> barbie.def
..\gpbarbie.dll: barbie.o barbie.def library.o ..\..\obj\interface.o
@$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
..\gpbarbie.dll: barbie.o barbie.def library.o
@$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldllib

4
camlibs/canon/makefile.os2
View File

@@ -37,5 +37,5 @@ canon.def: canon.o
copy canon.df canon.def
emxexp $** >> canon.def
..\gpcanon.dll: util.o canon.def serial.o canon.o psa50.o crc.o ..\..\obj\interface.o
$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
..\gpcanon.dll: util.o canon.def serial.o canon.o psa50.o crc.o
$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldllib

1779
camlibs/canon/psa50.c
View File

File diff suppressed because it is too large Load Diff

4
camlibs/digita/makefile.os2
View File

@@ -35,5 +35,5 @@ digita.def: digita.o
@copy digita.df digita.def
@emxexp $** >> digita.def
..\gpdigita.dll: digita.o digita.def serial.o commands.o usb.o ..\..\obj\interface.o
@$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
..\gpdigita.dll: digita.o digita.def serial.o commands.o usb.o
@$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldllib -lgiserial -lsocket

442
camlibs/directory/directory.c
View File

@@ -1,8 +1,8 @@
/* Notes:
* uses the setting value of "dir_directory" to open as the directory
(interfaces will want to set this when they choose to "open" a
directory.)
* adding filetypes: search for "jpg", copy line and change extension
* uses the setting value of "dir_directory" to open as the directory
(interfaces will want to set this when they choose to "open" a
directory.)
* adding filetypes: search for "jpg", copy line and change extension
*/
#include <stdio.h>
@@ -14,32 +14,32 @@
#include "directory.h"
char *extension[] = {
"gif",
"tif",
"jpg",
"xpm",
"png",
"pbm",
"pgm",
"jpeg",
"tiff",
NULL
"gif",
"tif",
"jpg",
"xpm",
"png",
"pbm",
"pgm",
"jpeg",
"tiff",
NULL
};
int is_image (char *filename) {
char *dot;
int x=0;
char *dot;
int x=0;
dot = strrchr(filename, '.');
if (dot) {
while (extension[x]) {
if (strcasecmp(extension[x], dot+1)==0)
return (1);
x++;
}
}
return (0);
dot = strrchr(filename, '.');
if (dot) {
while (extension[x]) {
if (strcmp(extension[x], dot+1)==0)
return (1);
x++;
}
}
return (0);
}
int camera_id (CameraText *id) {
@@ -52,321 +52,321 @@ int camera_id (CameraText *id) {
int camera_abilities (CameraAbilitiesList *list) {
CameraAbilities *a;
CameraAbilities *a;
a = gp_abilities_new();
a = gp_abilities_new();
strcpy(a->model, "Directory Browse");
a->port = GP_PORT_NONE;
a->speed[0] = 0;
strcpy(a->model, "Directory Browse");
a->port = GP_PORT_NONE;
a->speed[0] = 0;
a->capture = 0;
a->config = 1;
a->file_delete = 0;
a->file_preview = 1;
a->file_put = 0;
a->capture = 0;
a->config = 1;
a->file_delete = 0;
a->file_preview = 1;
a->file_put = 0;
gp_abilities_list_append(list, a);
gp_abilities_list_append(list, a);
return (GP_OK);
return (GP_OK);
}
int camera_init (Camera *camera, CameraInit *init) {
int i=0;
DirectoryStruct *d;
char buf[256];
int i=0;
DirectoryStruct *d;
char buf[256];
/* First, set up all the function pointers */
camera->functions->id = camera_id;
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->file_put = camera_file_put;
camera->functions->file_delete = camera_file_delete;
camera->functions->config = camera_config;
camera->functions->capture = camera_capture;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
/* First, set up all the function pointers */
camera->functions->id = camera_id;
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->file_put = camera_file_put;
camera->functions->file_delete = camera_file_delete;
camera->functions->config = camera_config;
camera->functions->capture = camera_capture;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
d = (DirectoryStruct*)malloc(sizeof(DirectoryStruct));
camera->camlib_data = d;
d = (DirectoryStruct*)malloc(sizeof(DirectoryStruct));
camera->camlib_data = d;
d->num_images = 0;
d->num_images = 0;
for (i=0; i<1024; i++)
strcpy(d->images[i], "");
for (i=0; i<1024; i++)
strcpy(d->images[i], "");
strcpy(d->directory, init->port.path);
if (strlen(d->directory)==0) {
strcpy(d->directory, "/");
}
strcpy(d->directory, init->port.path);
if (strlen(d->directory)==0) {
strcpy(d->directory, "/");
}
if (gp_setting_get("directory", "hidden", buf) != GP_OK)
gp_setting_set("directory", "hidden", "1");
if (gp_setting_get("directory", "hidden", buf) != GP_OK)
gp_setting_set("directory", "hidden", "1");
return (GP_OK);
return (GP_OK);
}
int camera_exit (Camera *camera) {
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
free(d);
free(d);
return (GP_OK);
return (GP_OK);
}
int camera_file_list(Camera *camera, CameraList *list, char *folder) {
GPIO_DIR d;
GPIO_DIRENT de;
char buf[1024], f[1024];
GPIO_DIR d;
GPIO_DIRENT de;
char buf[1024], f[1024];
if ((d = GPIO_OPENDIR(folder))==NULL)
return (GP_ERROR);
/* Make sure we have 1 delimiter */
if (folder[strlen(folder)-1] != '/')
sprintf(f, "%s%c", folder, '/');
else
strcpy(f, folder);
if ((d = GPIO_OPENDIR(folder))==NULL)
return (GP_ERROR);
while ((de = GPIO_READDIR(d))) {
if ((strcmp(GPIO_FILENAME(de), "." )!=0) &&
(strcmp(GPIO_FILENAME(de), "..")!=0)) {
sprintf(buf, "%s%s", f, GPIO_FILENAME(de));
if (GPIO_IS_FILE(buf) && (is_image(buf)))
gp_list_append(list, GPIO_FILENAME(de), GP_LIST_FILE);
}
}
/* Make sure we have 1 delimiter */
if (folder[strlen(folder)-1] != '/')
sprintf(f, "%s%c", folder, '/');
else
strcpy(f, folder);
return (GP_OK);
while ((de = GPIO_READDIR(d))) {
if ((strcmp(GPIO_FILENAME(de), "." )!=0) &&
(strcmp(GPIO_FILENAME(de), "..")!=0)) {
sprintf(buf, "%s%s", f, GPIO_FILENAME(de));
if (GPIO_IS_FILE(buf) && (is_image(buf)))
gp_list_append(list, GPIO_FILENAME(de), GP_LIST_FILE);
}
}
return (GP_OK);
}
int camera_folder_list(Camera *camera, CameraList *list, char *folder) {
GPIO_DIR d;
GPIO_DIRENT de;
char buf[1024], f[1024];
char *dirname;
int view_hidden=1;
GPIO_DIR d;
GPIO_DIRENT de;
char buf[1024], f[1024];
char *dirname;
int view_hidden=1;
if (gp_setting_get("directory", "hidden", buf)==GP_OK)
view_hidden = atoi(buf);
if ((d = GPIO_OPENDIR(folder))==NULL)
return (GP_ERROR);
if (gp_setting_get("directory", "hidden", buf)==GP_OK)
view_hidden = atoi(buf);
if ((d = GPIO_OPENDIR(folder))==NULL)
return (GP_ERROR);
/* Make sure we have 1 delimiter */
if (folder[strlen(folder)-1] != '/')
sprintf(f, "%s%c", folder, '/');
else
strcpy(f, folder);
/* Make sure we have 1 delimiter */
if (folder[strlen(folder)-1] != '/')
sprintf(f, "%s%c", folder, '/');
else
strcpy(f, folder);
while ((de = GPIO_READDIR(d))) {
if ((strcmp(GPIO_FILENAME(de), "." )!=0) &&
(strcmp(GPIO_FILENAME(de), "..")!=0)) {
sprintf(buf, "%s%s", f, GPIO_FILENAME(de));
dirname = GPIO_FILENAME(de);
if (GPIO_IS_DIR(buf)) {
if (dirname[0] != '.')
gp_list_append(list, GPIO_FILENAME(de), GP_LIST_FOLDER);
else
if (view_hidden)
gp_list_append(list, GPIO_FILENAME(de), GP_LIST_FOLDER);
}
}
}
while ((de = GPIO_READDIR(d))) {
if ((strcmp(GPIO_FILENAME(de), "." )!=0) &&
(strcmp(GPIO_FILENAME(de), "..")!=0)) {
sprintf(buf, "%s%s", f, GPIO_FILENAME(de));
dirname = GPIO_FILENAME(de);
if (GPIO_IS_DIR(buf)) {
if (dirname[0] != '.')
gp_list_append(list, GPIO_FILENAME(de), GP_LIST_FOLDER);
else
if (view_hidden)
gp_list_append(list, GPIO_FILENAME(de), GP_LIST_FOLDER);
}
}
}
return (GP_OK);
return (GP_OK);
}
int folder_index(Camera *camera) {
GPIO_DIR dir;
GPIO_DIRENT de;
char fname[1024];
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
GPIO_DIR dir;
GPIO_DIRENT de;
char fname[1024];
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
d->num_images = 0;
d->num_images = 0;
dir = GPIO_OPENDIR(d->directory);
if (!dir)
return (GP_ERROR);
de = GPIO_READDIR(dir);
while (de) {
sprintf(fname, "%s/%s", d->directory, GPIO_FILENAME(de));
if (GPIO_IS_FILE(fname)) {
strcpy(d->images[d->num_images++], GPIO_FILENAME(de));
if (camera->debug)
printf("directory: found \"%s\"\n", GPIO_FILENAME(de));
}
de = GPIO_READDIR(dir);
}
GPIO_CLOSEDIR(dir);
dir = GPIO_OPENDIR(d->directory);
if (!dir)
return (GP_ERROR);
de = GPIO_READDIR(dir);
while (de) {
sprintf(fname, "%s/%s", d->directory, GPIO_FILENAME(de));
if (GPIO_IS_FILE(fname)) {
strcpy(d->images[d->num_images++], GPIO_FILENAME(de));
if (camera->debug)
printf("directory: found \"%s\"\n", GPIO_FILENAME(de));
}
de = GPIO_READDIR(dir);
}
GPIO_CLOSEDIR(dir);
return (GP_OK);
return (GP_OK);
}
int directory_folder_set(Camera *camera, char *folder_name) {
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
strcpy(d->directory, folder_name);
strcpy(d->directory, folder_name);
return (folder_index(camera));
return (folder_index(camera));
}
int camera_file_get (Camera *camera, CameraFile *file, char *folder, char *filename) {
/**********************************/
/* file_number now starts at 0!!! */
/**********************************/
/**********************************/
/* file_number now starts at 0!!! */
/**********************************/
char buf[1024];
int result;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
char buf[1024];
int result;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
directory_folder_set(camera, folder);
directory_folder_set(camera, folder);
sprintf(buf, "%s/%s", d->directory, filename);
if ((result = gp_file_open(file, buf)) != GP_OK)
return (result);
sprintf(buf, "%s/%s", d->directory, filename);
if ((result = gp_file_open(file, buf)) != GP_OK)
return (result);
return (GP_OK);
return (GP_OK);
}
int camera_file_get_preview (Camera *camera, CameraFile *file, char *folder, char *filename) {
/**********************************/
/* file_number now starts at 0!!! */
/**********************************/
/**********************************/
/* file_number now starts at 0!!! */
/**********************************/
char buf[1024];
int result;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
char buf[1024];
int result;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
directory_folder_set(camera, folder);
directory_folder_set(camera, folder);
sprintf(buf, "%s/%s", d->directory, filename);
if ((result = gp_file_open(file, buf)) != GP_OK)
return (result);
sprintf(buf, "%s/%s", d->directory, filename);
if ((result = gp_file_open(file, buf)) != GP_OK)
return (result);
return (GP_OK);
return (GP_OK);
}
int camera_file_put (Camera *camera, CameraFile *file, char *folder) {
return (GP_ERROR_NOT_SUPPORTED);
return (GP_ERROR_NOT_SUPPORTED);
}
int camera_file_delete (Camera *camera, char *folder, char *filename) {
return (GP_ERROR_NOT_SUPPORTED);
return (GP_ERROR_NOT_SUPPORTED);
}
int camera_config (Camera *camera) {
CameraWidget *window, *t;
char buf[256];
int val;
CameraWidget *window, *t;
char buf[256];
int val;
window = gp_widget_new(GP_WIDGET_WINDOW, "Directory Configuration");
window = gp_widget_new(GP_WIDGET_WINDOW, "Directory Configuration");
t = gp_widget_new(GP_WIDGET_TOGGLE, "View hidden (dot) directories");
gp_setting_get("directory", "hidden", buf);
val = atoi (buf);
gp_widget_value_set(t, &val);
gp_widget_append(window, t);
t = gp_widget_new(GP_WIDGET_TOGGLE, "View hidden (dot) directories");
gp_setting_get("directory", "hidden", buf);
val = atoi (buf);
gp_widget_value_set(t, &val);
gp_widget_append(window, t);
/* Prompt the user with the config window */
if (gp_frontend_prompt (camera, window) == GP_PROMPT_CANCEL) {
gp_widget_unref(window);
return GP_OK;
}
t = gp_widget_child_by_label(window, "View hidden (dot) directories");
t = gp_widget_child_by_label(window, "View hidden (dot) directories");
if (gp_widget_changed(t)) {
gp_widget_value_get (t, &val);
sprintf(buf, "%i", val);
sprintf(buf, "%i", val);
gp_setting_set("directory", "hidden", buf);
}
return (GP_OK);
return (GP_OK);
#if 0
/* Example. shows when debugging is on */
/* Example. shows when debugging is on */
//FIXME: Syntax of gp_widget_value_get/set has changed!
/* Create a new section for "Quality" */
section = gp_widget_new(GP_WIDGET_SECTION, "Quality");
gp_widget_append(window, section);
/* Create a new section for "Quality" */
section = gp_widget_new(GP_WIDGET_SECTION, "Quality");
gp_widget_append(window, section);
/* Add the Resolution setting radio buttons */
t = gp_widget_new(GP_WIDGET_RADIO, "Resolution");
gp_widget_append(section, t);
gp_widget_choice_add(t, "Normal");
gp_widget_choice_add(t, "High");
gp_widget_choice_add(t, "Best");
gp_widget_value_set(t, "High");
/* Add the Resolution setting radio buttons */
t = gp_widget_new(GP_WIDGET_RADIO, "Resolution");
gp_widget_append(section, t);
gp_widget_choice_add(t, "Normal");
gp_widget_choice_add(t, "High");
gp_widget_choice_add(t, "Best");
gp_widget_value_set(t, "High");
t = gp_widget_new(GP_WIDGET_TEXT, "Camera Name");
gp_widget_append(section, t);
gp_widget_value_set(t, "hey there!");
t = gp_widget_new(GP_WIDGET_TEXT, "Camera Name");
gp_widget_append(section, t);
gp_widget_value_set(t, "hey there!");
t = gp_widget_new(GP_WIDGET_RANGE, "LCD Brightness");
gp_widget_append(section, t);
gp_widget_range_set(t, 1.0, 7.0, 1.0);
gp_widget_value_set(t, "4.0");
t = gp_widget_new(GP_WIDGET_RANGE, "LCD Brightness");
gp_widget_append(section, t);
gp_widget_range_set(t, 1.0, 7.0, 1.0);
gp_widget_value_set(t, "4.0");
/* Create a new section for "Flash/Lens" and append to window */
section = gp_widget_new(GP_WIDGET_SECTION, "Flash/Lens");
gp_widget_append(window, section);
/* Create a new section for "Flash/Lens" and append to window */
section = gp_widget_new(GP_WIDGET_SECTION, "Flash/Lens");
gp_widget_append(window, section);
t = gp_widget_new(GP_WIDGET_MENU, "Flash Setting");
gp_widget_append(section, t);
gp_widget_choice_add(t, "Auto");
gp_widget_choice_add(t, "Red-eye");
gp_widget_choice_add(t, "Force");
gp_widget_choice_add(t, "None");
gp_widget_value_set(t, "Red-eye");
t = gp_widget_new(GP_WIDGET_MENU, "Flash Setting");
gp_widget_append(section, t);
gp_widget_choice_add(t, "Auto");
gp_widget_choice_add(t, "Red-eye");
gp_widget_choice_add(t, "Force");
gp_widget_choice_add(t, "None");
gp_widget_value_set(t, "Red-eye");
t = gp_widget_new(GP_WIDGET_RADIO, "Lens Mode");
gp_widget_append(section, t);
gp_widget_choice_add(t, "Normal");
gp_widget_choice_add(t, "Macro");
gp_widget_value_set(t, "Macro");
#endif
t = gp_widget_new(GP_WIDGET_RADIO, "Lens Mode");
gp_widget_append(section, t);
gp_widget_choice_add(t, "Normal");
gp_widget_choice_add(t, "Macro");
gp_widget_value_set(t, "Macro");
#endif
}
int camera_capture (Camera *camera, CameraFile *file, CameraCaptureInfo *info) {
return (GP_ERROR_NOT_SUPPORTED);
return (GP_ERROR_NOT_SUPPORTED);
}
int camera_summary (Camera *camera, CameraText *summary) {
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
DirectoryStruct *d = (DirectoryStruct*)camera->camlib_data;
sprintf(summary->text, "Current directory:\n%s", d->directory);
sprintf(summary->text, "Current directory:\n%s", d->directory);
return (GP_OK);
return (GP_OK);
}
int camera_manual (Camera *camera, CameraText *manual) {
strcpy(manual->text, "The Directory Browse \"camera\" lets you index\nphotos on your hard drive. The folder list on the\nleft contains the folders on your hard drive,\nbeginning at the root directory (\"/\").");
strcpy(manual->text, "The Directory Browse \"camera\" lets you index\nphotos on your hard drive. The folder list on the\nleft contains the folders on your hard drive,\nbeginning at the root directory (\"/\").");
return (GP_OK);
return (GP_OK);
}
int camera_about (Camera *camera, CameraText *about) {
strcpy(about->text, "Directory Browse Mode\nScott Fritzinger <scottf@unr.edu>");
strcpy(about->text, "Directory Browse Mode\nScott Fritzinger <scottf@unr.edu>");
return (GP_OK);
return (GP_OK);
}

21
camlibs/directory/directory.def
View File

@@ -1,2 +1,23 @@
LIBRARY GPDIRECT
EXPORTS
; From ..\..\obj\directory.o
"extension"
"is_image"
"camera_id"
"camera_abilities"
"camera_init"
"camera_exit"
"camera_folder_list"
"camera_file_list"
"camera_file_get"
"camera_file_get_preview"
"camera_file_put"
"camera_file_delete"
"camera_config"
"camera_capture"
"camera_summary"
"camera_manual"
"camera_about"
"folder_index"
"directory_folder_set"

9
camlibs/directory/makefile.os2
View File

@@ -21,5 +21,10 @@ dll: ..\gpdirbrw.dll
..\..\obj\directory.o : directory.c directory.h
@$(CC) -o $@ directory.c $(CCFLAGS)
..\gpdirbrw.dll: ..\..\obj\directory.o ..\..\obj\main.o ..\..\obj\test.o ..\..\obj\script.o ..\..\obj\interface.o
@$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** directory.def -lwrap -lst\check -lgcc -L..\..\lib -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
directory.def: ..\..\obj\directory.o
@copy directory.df directory.def
@emxexp $** >> directory.def
..\gpdirbrw.dll: ..\..\obj\directory.o directory.def
@$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\lib -llibgphoto2 -llibgpio -ldllib

30
camlibs/makefile.os2
View File

@@ -13,25 +13,31 @@ end:
@echo ****
dll:
# @cd canon
# @nmake -nologo -f makefile.os2
# @cd..
@cd canon
@nmake -nologo -f makefile.os2
@cd..
@cd barbie
@nmake -nologo -f makefile.os2
@cd..
# @cd digita
# @nmake -nologo -f makefile.os2
# @cd..
# @cd directory
# @nmake -nologo -f makefile.os2
# @cd..
@cd sonydscf1
@cd digita
@nmake -nologo -f makefile.os2
@cd..
# @cd panasonic
@cd directory
@nmake -nologo -f makefile.os2
@cd..
# @cd sonydscf1
# @nmake -nologo -f makefile.os2
# @cd..
@cd fujitsu
@cd minolta\dimagev
@nmake -nologo -f makefile.os2
@cd..\..
@cd kodak\dc120
@nmake -nologo -f makefile.os2
@cd..\..
@cd sierra
@nmake -nologo -f makefile.os2
@cd..
@cd panasonic
@nmake -nologo -f makefile.os2
@cd..