Merge pull request #5004 from krismattheus/master

[pthreads] add version resource and fix problem with PTW32_ARCH when compiling resource
This commit is contained in:
Phil Christensen 2018-12-22 23:31:41 -08:00 committed by GitHub
commit 463541320d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -28,6 +28,7 @@ set(PTHREAD_SHARED_SOURCES
sync.c
tsd.c
attr.C
version.rc
)
set(PTHREAD_STATIC_SOURCES
autostatic.c
@ -169,8 +170,7 @@ set(PTHREAD_STATIC_SOURCES
option(PTW32_ARCH "x32")
add_definitions(-DPTW32_ARCH=${PTW32_ARCH} -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
if(BUILD_SHARED_LIBS)
set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES})

View File

@ -1,3 +1,3 @@
Source: pthreads
Version: 2.9.1-2
Version: 2.9.1-3
Description: pthreads for windows