diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2010-09-03 10:28:30 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2010-09-03 10:28:30 +0200 |
| commit | 945f4da2ea2988aaa28d91d6541921e76a637499 (patch) | |
| tree | f8bd42a0d95eeedb93dd4c80dba1f0fdcd6cad08 | |
| parent | 81859cf3cad74a7d8cc5938255ac8daa1cf15514 (diff) | |
| download | sqlitexx-945f4da2ea2988aaa28d91d6541921e76a637499.tar.gz sqlitexx-945f4da2ea2988aaa28d91d6541921e76a637499.tar.bz2 | |
small fixes for threading test on Windows
| -rw-r--r-- | tests/GNUmakefile | 7 | ||||
| -rw-r--r-- | tests/Makefile.W32 | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/GNUmakefile b/tests/GNUmakefile index 87122a1..a2bd9af 100644 --- a/tests/GNUmakefile +++ b/tests/GNUmakefile @@ -24,12 +24,13 @@ TEST_CPP_BINS = \ test6$(EXE) \ test7$(EXE) \ test8$(EXE) \ - threads.o test9$(EXE) + test9$(EXE) TEST_BINS = \ testc$(EXE) -OBJS = +OBJS = \ + threads.o -include $(TOPDIR)/makefiles/gmake/sub.mk @@ -49,7 +50,7 @@ test5$(EXE): $(TOPDIR)/src/libsqlite3xx.a test6$(EXE): $(TOPDIR)/src/libsqlite3xx.a test7$(EXE): $(TOPDIR)/src/libsqlite3xx.a test8$(EXE): $(TOPDIR)/src/libsqlite3xx.a -test9$(EXE): $(TOPDIR)/src/libsqlite3xx.a +test9$(EXE): $(TOPDIR)/src/libsqlite3xx.a threads.o # disabled tests #-@./exec_test test6 "STL iterators" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)" diff --git a/tests/Makefile.W32 b/tests/Makefile.W32 index d2f8ec7..bffd817 100644 --- a/tests/Makefile.W32 +++ b/tests/Makefile.W32 @@ -28,6 +28,9 @@ TEST_CPP_BINS = \ TEST_BINS = \ testc.exe +OBJS = \ + threads.obj + !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk # temporary @@ -40,7 +43,7 @@ test5.exe: test5.obj test6.exe: test6.obj test7.exe: test7.obj test8.exe: test8.obj -test9.exe: test9.obj +test9.exe: test9.obj threads.obj local_all: |