YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4d.lib
!else
YAZ_DLL=$(BINDIR)\yaz4.dll
YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
TEST_MUTEX=$(BINDIR)\test_mutex.exe
# shortcut names defined here
-dll: dirs generate $(YAZ_DLL)
+dll: dirs generate $(YAZ_DLL) $(YAZ_COND_DLL)
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
DEBUG_LNK_OPTIONS= /debug
$(OBJDIR)\fhistory.obj
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
+COND_DLL_OBJS= $(OBJDIR)\condvar.obj
ZTEST_OBJS= \
$(OBJDIR)\dummy-opac.obj \
$(OBJDIR)\iconv_decode_iso5426.obj \
$(OBJDIR)\iconv_decode_danmarc.obj \
$(OBJDIR)\mutex.obj \
+ $(OBJDIR)\thread_create.obj \
+ $(OBJDIR)\spipe.obj \
$(OBJDIR)\gettimeofday.obj \
$(OBJDIR)\json.obj \
$(OBJDIR)\sc.obj \
/implib:"$(YAZ_ICU_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
+$(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
+ $(LINK_DLL) $(COND_LIB) $(YAZ_IMPLIB)\
+ $(COND_DLL_OBJS) \
+ $(YAZ_COND_RES) \
+ /out:$@ \
+ /implib:"$(YAZ_COND_IMPLIB)"
+ $(MT) -manifest $@.manifest -outputresource:$@;2
+
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
-$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_DLL)
- $(LINK_PROGRAM) $(TEST_MUTEX_OBJS) /out:$@
+$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_COND_DLL)
+ $(LINK_PROGRAM) $(YAZ_COND_IMPLIB) $(TEST_MUTEX_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
# Other rules