bvl: OS/2 build system update
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1929 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -17,5 +17,5 @@ directory.def: directory.o
|
||||
@$(MAKEDEF)
|
||||
|
||||
$(CAMLIBS)\gpdirbrw.dll: $(OBJS) directory.def
|
||||
@$(CC) $(DLLLINKFLAGS) -o $@ $** $(LIBS)
|
||||
@$(CC) $(DLLLINKFLAGS) -o $@ $** $(LIBS) -lst\check -lgcc
|
||||
|
||||
|
||||
@@ -46,9 +46,9 @@ dll:
|
||||
@cd panasonic
|
||||
@nmake -nologo -f makefile.os2
|
||||
@cd..
|
||||
# @cd sierra
|
||||
# @nmake -nologo -f makefile.os2
|
||||
# @cd..
|
||||
@cd sierra
|
||||
@nmake -nologo -f makefile.os2
|
||||
@cd..
|
||||
@cd sonydscf1
|
||||
@nmake -nologo -f makefile.os2
|
||||
@cd..
|
||||
|
||||
@@ -50,7 +50,9 @@ int camera_abilities (CameraAbilitiesList *list) {
|
||||
if a camera supported multiple ways. */
|
||||
strcpy(a->model, "Sony DSC-F1");
|
||||
a->port=GP_PORT_SERIAL;
|
||||
a->speed[0] = 0;
|
||||
a->speed[0] = 9600;
|
||||
a->speed[1] = 19200;
|
||||
a->speed[2] = 38400;
|
||||
a->operations = GP_OPERATION_NONE;
|
||||
a->file_operations = GP_FILE_OPERATION_DELETE |
|
||||
GP_FILE_OPERATION_PREVIEW;
|
||||
@@ -98,7 +100,7 @@ int camera_init (Camera *camera) {
|
||||
gp_port_timeout_set(b->dev, 5000);
|
||||
strcpy(settings.serial.port, camera->port->path);
|
||||
|
||||
settings.serial.speed = 38400;
|
||||
settings.serial.speed = camera->port->speed;
|
||||
settings.serial.bits = 8;
|
||||
settings.serial.parity = 0;
|
||||
settings.serial.stopbits= 1;
|
||||
|
||||
@@ -6,7 +6,8 @@ CC=gcc
|
||||
DLLLINKFLAGS=-Zdll -Zmtd -Zcrtdll
|
||||
EXELINKFLAGS=-Zmtd -Zcrtdll
|
||||
LINK=gcc
|
||||
LIBS=-L$(BASEPATH)\lib -Zbin-files -llibgphoto2 -llibgphoto2_port -ldllib -lst\check -lgcc
|
||||
#LIBS=-L$(BASEPATH)\lib -Zbin-files -llibgphoto2 -llibgphoto2_port -ldllib -lst\check -lgcc
|
||||
LIBS=-L$(BASEPATH)\lib -Zbin-files -llibgphoto2 -llibgphoto2_port -ldllib
|
||||
MAKEDEF=copy $*.df $@ >NUL & emxexp $** >> $@
|
||||
MKLIB=ar r
|
||||
|
||||
|
||||
Reference in New Issue
Block a user