diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 20:48:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 20:57:10 +0200 |
| commit | bc04a7600c5057957ed8805f1c9b7d14811e3e72 (patch) | |
| tree | a80bf465a7562bc2b3ea2ffc6b971e4d0bf32584 /stlport | |
| parent | 9cf5f41bedbb0830716f2f62deadfae30d675796 (diff) | |
Make 64-bit Windows build work in stlport
* stlport/STLport-4.5-0119.patch Add a few bits to our patch
file. Don't use the /machine:I386 /debugtype:cv linker flags, the
defaults are what we want for both 32- and 64-bit. Make the weird
Interlocked* stuff build on a 64-bit build too.
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/STLport-4.5-0119.patch | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/stlport/STLport-4.5-0119.patch b/stlport/STLport-4.5-0119.patch index db2c62b22ad3..bb17a11a6bdb 100644 --- a/stlport/STLport-4.5-0119.patch +++ b/stlport/STLport-4.5-0119.patch @@ -38,7 +38,7 @@ MKDIR=-mkdir LINK_OUT=/out: -@@ -51,7 +51,7 @@ +@@ -51,15 +51,15 @@ # # FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS) @@ -47,6 +47,15 @@ FLAGS_COMMON_static = $(FLAGS_COMMON) /FD /D "_STLP_NO_FORCE_INSTANTIATE" FLAGS_COMMON_dynamic = $(FLAGS_COMMON) + FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS) + # FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS) + FLAGS_NDEBUG=/O2 /DNDEBUG $(EXTRA_NDEBUG_FLAGS) + +-LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv ++LDFLAGS_COMMON=/nologo + LDFLAGS_DEBUG=/debug + LDFLAGS_RELEASE=/opt:ref + --- misc/STLport-4.5-0119/stlport/config/_epilog.h Thu Sep 6 00:11:36 2001 +++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h Mon Jun 2 10:32:02 2008 @@ -4,6 +4,7 @@ @@ -1326,3 +1335,14 @@ explicit _DBG_vector(size_type __n) : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {} +--- misc/build/STLport-4.5-0119/stlport/stl/_threads.h ++++ misc/build/STLport-4.5-0119/stlport/stl/_threads.h +@@ -99,7 +99,7 @@ + # else + // This section serves as a replacement for windows.h header for Visual C++ + extern "C" { +-# if (defined(_M_MRX000) || defined(_M_ALPHA) \ ++# if (defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_AMD64) \ + || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED) + # define InterlockedIncrement _InterlockedIncrement + # define InterlockedDecrement _InterlockedDecrement |