From 0e2ae18a97fd507bac872031888d34c3a7d8b17b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 3 Sep 2010 16:20:38 +0200 Subject: Implement Win32 TLS support --- odb/makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'odb/makefile') diff --git a/odb/makefile b/odb/makefile index e058463..0fb038d 100644 --- a/odb/makefile +++ b/odb/makefile @@ -26,9 +26,14 @@ details/posix/thread.cxx # Win32-based implementation details. # win32_cxx := \ -details/win32/exceptions.cxx \ +details/win32/init.cxx \ +details/win32/once.cxx \ +details/win32/tls.cxx \ details/win32/condition.cxx \ -details/win32/thread.cxx +details/win32/thread.cxx \ +details/win32/exceptions.cxx + +win32_dll_cxx := details/win32/dll.cxx cxx_tun := $(cxx) $(posix_cxx) cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) @@ -61,6 +66,7 @@ $(out_base)/: $(odb.l) $(dist): export sources := $(cxx) $(dist): export posix_sources := $(posix_cxx) $(dist): export win32_sources := $(win32_cxx) +$(dist): export win32_dll_sources := $(win32_dll_cxx) $(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ -path $(src_base)/details/posix -a -prune -a -false -o \ @@ -79,7 +85,8 @@ $(dist): export interface_version = $(shell sed -e \ $(dist): $(call dist-data,$(sources) $(posix_sources) $(win32_sources) \ -$(headers) $(posix_headers) $(win32_headers) $(data_dist) details/config.h.in) +$(win32_dll_sources) $(headers) $(posix_headers) $(win32_headers) \ +$(data_dist) details/config.h.in) $(call meta-vc9proj,$(src_base)/libodb-vc9.vcproj) $(call meta-vc10proj,$(src_base)/libodb-vc10.vcxproj) $(call meta-automake) -- cgit v1.1