From 043bd29fb384f68fafb69c4acd5b98e4c2b6d7ea Mon Sep 17 00:00:00 2001
From: bvl <simpson2@users.sourceforge.net>
Date: Thu, 19 Jul 2001 14:38:18 +0000
Subject: [PATCH] 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
---
 camlibs/directory/makefile.os2 | 2 +-
 camlibs/makefile.os2           | 6 +++---
 camlibs/sonydscf1/sonydscf1.c  | 6 ++++--
 os2mak.inc                     | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/camlibs/directory/makefile.os2 b/camlibs/directory/makefile.os2
index 614d0d34d..c109137cd 100644
--- a/camlibs/directory/makefile.os2
+++ b/camlibs/directory/makefile.os2
@@ -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
 
diff --git a/camlibs/makefile.os2 b/camlibs/makefile.os2
index cfc4f5a55..f12f6f269 100644
--- a/camlibs/makefile.os2
+++ b/camlibs/makefile.os2
@@ -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..
diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c
index 0f524bde9..e079bbe37 100644
--- a/camlibs/sonydscf1/sonydscf1.c
+++ b/camlibs/sonydscf1/sonydscf1.c
@@ -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;
diff --git a/os2mak.inc b/os2mak.inc
index f5efbd4aa..dff314be4 100644
--- a/os2mak.inc
+++ b/os2mak.inc
@@ -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