summaryrefslogtreecommitdiffstats
path: root/ucb
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-20 20:19:48 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-20 20:19:48 +0300
commit855fd72c8056a3f9e04601f0d2bd9a1cb897d79e (patch)
tree0e78021585ae8542eb6729a42f9bec75a317c936 /ucb
parentAdd a few casts to fix MinGW compilation errors (diff)
downloadcore-855fd72c8056a3f9e04601f0d2bd9a1cb897d79e.tar.gz
core-855fd72c8056a3f9e04601f0d2bd9a1cb897d79e.zip
Fix build of our odma_lib library with MinGW
Diffstat (limited to 'ucb')
-rw-r--r--ucb/prj/d.lst4
-rw-r--r--ucb/source/ucp/odma/makefile.mk7
2 files changed, 6 insertions, 5 deletions
diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 149f4bf4121c..db5b2903041d 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -24,7 +24,9 @@
..\%__SRC%\misc\ucp*.map %_DEST%\bin\ucp*.map
..\%__SRC%\misc\ucp*.sym %_DEST%\bin\ucp*.sym
-..\%__SRC%\slb\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\%__SRC%\lib\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\%__SRC%\lib\libodma_lib.a %_DEST%\lib\libodma_lib.a
+
..\source\ucp\odma\odma.h %_DEST%\inc\odma.h
..\source\ucp\odma\odma_lib.hxx %_DEST%\inc\odma_lib.hxx
diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
index 4af8c7649ae5..302cf19bc9ee 100644
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
@@ -93,10 +93,9 @@ DEF2DES=UCB ODMA URL converter
# --- odma_lib library -----------------------------------------------
-SLO3FILES=$(SLO)$/odma_lib.obj
-
-LIB3TARGET=$(SLB)$/odma_lib.lib
-LIB3OBJFILES=$(SLO3FILES)
+LIB3TARGET=$(LB)/odma_lib.lib
+LIB3ARCHIV=$(LB)/libodma_lib.a
+LIB3OBJFILES=$(OBJ)$/odma_lib.obj
# --- Targets ----------------------------------------------------------