bvl: OS/2 updates and stupid bugfix in libgphoto2_port\library.c

     sorry folks


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1632 67ed7778-7388-44ab-90cf-0a291f65f57c

7 files changed, 10 insertions, 10 deletions

diff --git a/frontends/command-line/makefile.os2 b/frontends/command-line/makefile.os2
index e380e5664..678ccfbc1 100644
--- a/frontends/command-line/makefile.os2
+++ b/frontends/command-line/makefile.os2
@@ -41,5 +41,5 @@ cmdline: ..\..\gphoto2.exe
 ..\..\obj\foreach.o: foreach.c
   @$(CC) -o $@ $** $(CCFLAGS)
 
-..\..\gphoto2.exe: ..\..\obj\interface.o ..\..\obj\script.o ..\..\obj\main.o ..\..\obj\test.o ..\..\lib\libgphoto2.a ..\..\lib\libgphoto2_port.a ..\..\obj\actions.o ..\..\obj\shell.o ..\..\obj\foreach.o ..\..\obj\options.o  ..\..\obj\range.o
-  @$(CC) -O2 $** -o $@ -Zbin-files -Zcrtdll -Zmtd -s -L..\..\lib -llibgphoto2 -llibgphoto2_port -ldllib -lmt\emx
+..\..\gphoto2.exe: ..\..\obj\interface.o ..\..\obj\script.o ..\..\obj\main.o ..\..\obj\test.o ..\..\obj\actions.o ..\..\obj\shell.o ..\..\obj\foreach.o ..\..\obj\options.o  ..\..\obj\range.o
+  @$(CC) -O2 $** -o $@ -Zmtd -Zcrtdll -L..\..\lib -Zbin-files -llibgphoto2 -llibgphoto2_port -ldllib
diff --git a/include/gphoto2-portability-os2.h b/include/gphoto2-portability-os2.h
index acf566cdd..444b5f2d9 100644
--- a/include/gphoto2-portability-os2.h
+++ b/include/gphoto2-portability-os2.h
@@ -3,8 +3,8 @@
 #include <sys/param.h>
 #define GPHOTO_OS2_INCLUDED
 
-#define CAMLIBS "./camlibs"
-/*#define CAMLIBS getenv("CAMLIBS")*/
+/*#define CAMLIBS "./camlibs"*/
+#define CAMLIBS getenv("CAMLIBS")
 #define RTLD_LAZY       0x001
 #define VERSION "2"
 #define usleep(t)          _sleep2(((t)+500)/ 1000)
diff --git a/libgphoto2/makefile.os2 b/libgphoto2/makefile.os2
index 7e8fb56a3..d4f8582f2 100644
--- a/libgphoto2/makefile.os2
+++ b/libgphoto2/makefile.os2
@@ -74,6 +74,6 @@ gphoto2.def: ..\obj\core.o ..\obj\exif.o ..\obj\file.o ..\obj\filesys.o ..\obj\l
    @emxexp $** >> gphoto2.def
 
 ..\gphoto2.dll: gphoto2.def ..\obj\core.o ..\obj\exif.o ..\obj\file.o ..\obj\filesys.o ..\obj\library.o ..\obj\settings.o ..\obj\util.o ..\obj\widget.o ..\obj\lists.o ..\obj\camera.o ..\obj\frontend.o ..\obj\port.o
-  @$(CC) -Wall -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\lib -ldllib -llibgphoto2_port
+  @$(CC) -Wall -Zmtd -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\lib -ldllib -llibgphoto2_port
 
 
diff --git a/libgphoto2_port/include/gphoto2_port-portability-os2.h b/libgphoto2_port/include/gphoto2_port-portability-os2.h
index 7b72b1904..e9b5d41a5 100644
--- a/libgphoto2_port/include/gphoto2_port-portability-os2.h
+++ b/libgphoto2_port/include/gphoto2_port-portability-os2.h
@@ -1,7 +1,7 @@
 #ifndef GPIO_OS2_INCLUDED
 #define GPIO_OS2_INCLUDED
-/*#define IOLIBS getenv("IOLIBS")*/
-#define IOLIBS "./libgphoto2_port"
+#define IOLIBS getenv("IOLIBS")
+/*#define IOLIBS "./libgphoto2_port"*/
 #define RTLD_LAZY       0x001
 #ifndef HAVE_TERMIOS_H
 /* c_cflag bit meaning */
diff --git a/libgphoto2_port/libgphoto2_port/library.c b/libgphoto2_port/libgphoto2_port/library.c
index 2730e14da..9ffb2818f 100644
--- a/libgphoto2_port/libgphoto2_port/library.c
+++ b/libgphoto2_port/libgphoto2_port/library.c
@@ -89,7 +89,7 @@ int gp_port_library_list (gp_port_info *list, int *count) {
                 loaded[x]=0;
 
         /* Look for available camera libraries */
-        d = GP_SYSTEM_OPENDIR("E:\\netlabs\\gnome\\gphoto2\\libgphoto2_port");
+        d = GP_SYSTEM_OPENDIR(IOLIBS);
         if (!d) {
                 gp_port_debug_printf(GP_DEBUG_LOW, glob_debug_level,
                         "couldn't open %s ", IOLIBS);
diff --git a/libgphoto2_port/makefile.os2 b/libgphoto2_port/makefile.os2
index 9e5b512ba..765f0bd1c 100644
--- a/libgphoto2_port/makefile.os2
+++ b/libgphoto2_port/makefile.os2
@@ -59,4 +59,4 @@ lgp2port.def: obj\gp_port.o obj\portability.o obj\library.o
    @emxexp $** >> lgp2port.def
 
 ..\lgp2port.dll: lgp2port.def obj\gp_port.o obj\portability.o obj\library.o
-  @$(CC) -Wall -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\..\lib -ldllib
+  @$(CC) -Zmtd -Wall -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\..\lib -ldllib
diff --git a/libgphoto2_port/serial/makefile.os2 b/libgphoto2_port/serial/makefile.os2
index d4049a1c9..d02d8a252 100644
--- a/libgphoto2_port/serial/makefile.os2
+++ b/libgphoto2_port/serial/makefile.os2
@@ -33,4 +33,4 @@ serial.def: ..\obj\serial.o
    @emxexp $** >> serial.def
 
 ..\giserial.dll: ..\obj\serial.o serial.def
-   @$(CC) -Wall -Zdll -Zcrtdll -o $@ $** -L..\..\lib -ldllib
+   @$(CC) -Wall -Zmtd -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\..\lib -ldllib