diff options
| author | U-Andreas-PC\Andreas <abaumann@yahoo.com> | 2011-03-21 15:11:34 +0100 |
|---|---|---|
| committer | U-Andreas-PC\Andreas <abaumann@yahoo.com> | 2011-03-21 15:11:34 +0100 |
| commit | 61adb6a1ba66d0990ccc72b6a105797987c0a4f3 (patch) | |
| tree | 8b9e2f43463336b173ada6d2137ae47eb26318af | |
| parent | 59c7bbb7bb618a770a4534a91e748de53203dd7a (diff) | |
| download | sqlitexx-61adb6a1ba66d0990ccc72b6a105797987c0a4f3.tar.gz sqlitexx-61adb6a1ba66d0990ccc72b6a105797987c0a4f3.tar.bz2 | |
tested on Windows 7 64-bit with VC8 (Platform SDK 7.0)
fixed bug in test9
| -rw-r--r-- | sqlite-3.7.5/Makefile.W32 | 2 | ||||
| -rw-r--r-- | src/Makefile.W32 | 13 | ||||
| -rw-r--r-- | tests/Makefile.W32 | 9 | ||||
| -rw-r--r-- | tests/test9.cpp | 2 |
4 files changed, 16 insertions, 10 deletions
diff --git a/sqlite-3.7.5/Makefile.W32 b/sqlite-3.7.5/Makefile.W32 index 5bb8070..a911d8b 100644 --- a/sqlite-3.7.5/Makefile.W32 +++ b/sqlite-3.7.5/Makefile.W32 @@ -4,7 +4,7 @@ SUBDIRS = INCLUDE_DIRS = \ /I. \ - /D_WIN32_WINNT=0x400 /I"$(PLATFORM_SDK_DIR)\Include" + /D_WIN32_WINNT=0x500 /I"$(PLATFORM_SDK_DIR)\Include" BINS = diff --git a/src/Makefile.W32 b/src/Makefile.W32 index a0238a4..76bf756 100644 --- a/src/Makefile.W32 +++ b/src/Makefile.W32 @@ -7,11 +7,14 @@ SUBDIRS = INCLUDE_DIRS = \ /I$(TOPDIR)\include /I. \ /I$(TOPDIR)\sqlite-$(SQLITE_VERSION) \ - /D_WIN32_WINNT=0x400 /I"$(PLATFORM_SDK_DIR)\Include" - -INCLUDE_LDFLAGS = \ - /LIBPATH:"$(PLATFORM_SDK_DIR)\Lib" - + /D_WIN32_WINNT=0x500 /I"$(PLATFORM_SDK_DIR)\Include" + +# enable only for really old platform SDKs +#SDK_LDFLAGS = /LIBPATH:"$(PLATFORM_SDK_DIR)\lib\x64" +#SDK_LDFLAGS = /LIBPATH:"$(PLATFORM_SDK_DIR)\lib" +#INCLUDE_LDFLAGS = \ +# $(SDK_LDFLAGS) + INCLUDE_LIBS = \ $(TOPDIR)\sqlite-$(SQLITE_VERSION)\sqlite3.lib diff --git a/tests/Makefile.W32 b/tests/Makefile.W32 index 5f60596..0e3cf5f 100644 --- a/tests/Makefile.W32 +++ b/tests/Makefile.W32 @@ -5,10 +5,13 @@ SUBDIRS = INCLUDE_DIRS = \ /I$(TOPDIR)\include /I. \ /I$(TOPDIR)\sqlite-$(SQLITE_VERSION) \ - /D_WIN32_WINNT=0x400 /I"$(PLATFORM_SDK_DIR)\Include" + /D_WIN32_WINNT=0x500 /I"$(PLATFORM_SDK_DIR)\Include" -INCLUDE_LDFLAGS = \ - /LIBPATH:"$(PLATFORM_SDK_DIR)\lib" +# enable only for really old platform SDKs +#SDK_LDFLAGS = /LIBPATH:"$(PLATFORM_SDK_DIR)\lib\x64" +#SDK_LDFLAGS = /LIBPATH:"$(PLATFORM_SDK_DIR)\lib" +#INCLUDE_LDFLAGS = \ +# $(SDK_LDFLAGS) INCLUDE_LIBS = \ $(TOPDIR)\src\sqlite3xx.lib \ diff --git a/tests/test9.cpp b/tests/test9.cpp index e3ae237..cad0f05 100644 --- a/tests/test9.cpp +++ b/tests/test9.cpp @@ -71,7 +71,7 @@ PRODUCER_PREPARE_AGAIN: for( int j = 0; j < NOF_PRODUCER_OPS; j++ ) { PRODUCER_INS_AGAIN: try { - result r = t.prepared( "ins" )( no * 100000 + i * 1000 + j ).exec( ); + result r = t.prepared( "ins" )( (int)no * 100000 + i * 1000 + j ).exec( ); assert( r.affected_rows( ) == 1 ); t.commit( ); } catch( const database_locked& e ) { |