Skip to content

Commit 0eaa295

Browse files
sapposappo
authored
Merge pull request #508 from bluca/regen
Problem: we want a new release but API is not compatible
2 parents 98bb23d + d37ba9d commit 0eaa295

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+425
-150
lines changed

‎CMakeLists.txt

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,21 @@ if (NOT CMAKE_BUILD_TYPE)
2626
if (EXISTS "${SOURCE_DIR}/.git")
2727
set (CMAKE_BUILD_TYPE Debug)
2828
else ()
29-
set (CMAKE_BUILD_TYPE Release)
29+
# http://xit0.org/2013/04/cmake-use-git-branch-and-commit-details-in-project/
30+
# http://stackoverflow.com/questions/6797395/cmake-execute-process-always-fails-with-no-such-file-or-directory-when-i-cal
31+
execute_process(
32+
COMMAND git rev-parse --show-toplevel
33+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
34+
RESULT_VARIABLE git_result
35+
OUTPUT_VARIABLE git_root
36+
OUTPUT_STRIP_TRAILING_WHITESPACE
37+
)
38+
message(STATUS "git workspace root [${git_result}]: ${git_root}")
39+
if ( "${git_result}" == "0" )
40+
set (CMAKE_BUILD_TYPE Debug)
41+
else ()
42+
set (CMAKE_BUILD_TYPE Release)
43+
endif ()
3044
endif ()
3145
endif ()
3246
if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
@@ -142,6 +156,12 @@ set (zyre_sources
142156
src/zyre_group.c
143157
src/zyre_node.c
144158
)
159+
IF (ENABLE_DRAFTS)
160+
list (APPEND zyre_sources
161+
src/zyre_private_selftest.c
162+
)
163+
ENDIF (ENABLE_DRAFTS)
164+
145165
source_group("Source Files" FILES ${zyre_sources})
146166
if (NOT DEFINED BUILD_SHARED_LIBS)
147167
SET(BUILD_SHARED_LIBS ON)
@@ -150,11 +170,8 @@ add_library(zyre ${zyre_sources})
150170
set_target_properties(zyre
151171
PROPERTIES DEFINE_SYMBOL "ZYRE_EXPORTS"
152172
)
153-
set_target_properties(zyre
154-
PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${SOURCE_DIR}/src"
155-
)
156173
set_target_properties (zyre
157-
PROPERTIES SOVERSION "1.0.3"
174+
PROPERTIES SOVERSION "2.0.0"
158175
)
159176
target_link_libraries(zyre
160177
${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}
@@ -171,7 +188,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project
171188
########################################################################
172189
# pkgconfig
173190
########################################################################
174-
set (VERSION "1.3.0")
191+
set (VERSION "2.0.0")
175192
set (prefix "${CMAKE_INSTALL_PREFIX}")
176193
set (exec_prefix "\${prefix}")
177194
set (libdir "\${prefix}/lib${LIB_SUFFIX}")
@@ -306,6 +323,12 @@ set(TEST_CLASSES
306323
zyre_event
307324
)
308325

326+
IF (ENABLE_DRAFTS)
327+
list (APPEND TEST_CLASSES
328+
private_classes
329+
)
330+
ENDIF (ENABLE_DRAFTS)
331+
309332
foreach(TEST_CLASS ${TEST_CLASSES})
310333
add_test(
311334
NAME ${TEST_CLASS}

‎Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ noinst_PROGRAMS =
2424
check_PROGRAMS =
2525
noinst_LTLIBRARIES =
2626
TESTS =
27+
# Prepare variables that can be populated (appended) in generated Makefiles or
28+
# manually maintained src/Makemodules-local.am
2729
EXTRA_DIST =
30+
CLEANFILES =
31+
DISTCLEANFILES =
2832

2933
if ENABLE_DIST_CMAKEFILES
3034
EXTRA_DIST += \

‎bindings/jni/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Then in the android directory, run:
4949
This does the following:
5050

5151
* It compiles the zyre C sources for Android, into a native library libzyre.so in builds/android/
52-
* It compiles the JNI Java classes into a jar file zyre-jni-1.3.0.jar in bindings/jni/build/libs
52+
* It compiles the JNI Java classes into a jar file zyre-jni-2.0.0.jar in bindings/jni/build/libs
5353
* It compiles the JNI C sources for Android, into a native library libzyrejni.so.
5454
* It takes czmq-jni-*.jar, which must already be built in ../czmq/bindings/jni/build/libs/
5555
* It combines all these into zyre-android.jar, which you can use in your Android projects.

‎bindings/jni/android/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ make $MAKE_OPTIONS
5353

5454
echo "******** Building zyre.jar for Android"
5555
# Copy class files into org/zeromq/etc.
56-
unzip -q ../../build/libs/zyre-jni-1.3.0.jar
56+
unzip -q ../../build/libs/zyre-jni-2.0.0.jar
5757
unzip -q -o ../../../../../czmq/bindings/jni/android/czmq-android.jar
5858

5959
# Copy native libraries into lib/armeabi

‎bindings/jni/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
}
1313

1414
group = "org.zeromq"
15-
version = "1.3.0"
15+
version = "2.0.0"
1616

1717
repositories {
1818
mavenLocal()
@@ -113,8 +113,8 @@ bintray {
113113
vcsUrl = 'http://github.com/zeromq/zyre.git'
114114
githubRepo = System.getenv('BINTRAY_USER_ORG') + '/zyre'
115115
version {
116-
name = '1.3.0'
117-
vcsTag= '1.3.0'
116+
name = '2.0.0'
117+
vcsTag= '2.0.0'
118118
}
119119
}
120120
}

‎bindings/jni/ci_build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
3434
CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
3535
CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
3636
CONFIG_OPTS+=("--with-docs=no")
37-
CONFIG_OPTS+=("--quiet")
37+
if [ -z "${CI_CONFIG_QUIET-}" ] || [ "${CI_CONFIG_QUIET-}" = yes ] || [ "${CI_CONFIG_QUIET-}" = true ]; then
38+
CONFIG_OPTS+=("--quiet")
39+
fi
3840

3941
pushd ../../..
4042

‎bindings/jni/msvc/resource.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ END
4949
//
5050

5151
VS_VERSION_INFO VERSIONINFO
52-
FILEVERSION 1,3,0,0
53-
PRODUCTVERSION 1,3,0,0
52+
FILEVERSION 2,0,0,0
53+
PRODUCTVERSION 2,0,0,0
5454
FILEFLAGSMASK 0x3fL
5555
#ifdef _DEBUG
5656
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
6767
BEGIN
6868
VALUE "CompanyName", "The AUTHORS"
6969
VALUE "FileDescription", "an open-source framework for proximity-based P2P apps"
70-
VALUE "FileVersion", "1.3.0.0"
70+
VALUE "FileVersion", "2.0.0.0"
7171
VALUE "InternalName", "zyre"
7272
VALUE "LegalCopyright", "Copyright (c) the Authors"
7373
VALUE "OriginalFilename", "libzyre.dll"
7474
VALUE "ProductName", "zyre"
75-
VALUE "ProductVersion", "1.3.0.0"
75+
VALUE "ProductVersion", "2.0.0.0"
7676
END
7777
END
7878
BLOCK "VarFileInfo"

‎bindings/python/zyre/_zyre_ctypes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ def return_fresh_string(char_p):
4444
# load the library. If we use find_library below, we get the wrong result.
4545
if os.name == 'posix':
4646
if sys.platform == 'darwin':
47-
lib = cdll.LoadLibrary('libzyre.1.dylib')
47+
lib = cdll.LoadLibrary('libzyre.2.dylib')
4848
else:
49-
lib = cdll.LoadLibrary("libzyre.so.1")
49+
lib = cdll.LoadLibrary("libzyre.so.2")
5050
elif os.name == 'nt':
5151
lib = cdll.LoadLibrary('libzyre.dll')
5252
except OSError:

‎bindings/python_cffi/zyre_cffi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# load the library. If we use find_library below, we get the wrong result.
1616
if os.name == 'posix':
1717
if sys.platform == 'darwin':
18-
libpath = 'libzyre.1.dylib'
18+
libpath = 'libzyre.2.dylib'
1919
else:
20-
libpath = 'libzyre.so.1'
20+
libpath = 'libzyre.so.2'
2121
elif os.name == 'nt':
2222
libpath = 'libzyre.dll'
2323
lib = ffi.dlopen(libpath)

‎bindings/qt/buildlib/buildlib.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Read the zproject/README.md for information about making permanent changes. #
44
################################################################################
55
TEMPLATE = lib
6-
VERSION = 1.3.0
6+
VERSION = 2.0.0
77
CONFIG += qt dll qzyre-buildlib
88
mac:CONFIG += absolute_library_soname
99
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all

‎bindings/ruby/lib/zyre/ffi/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
module Zyre
77
module FFI
8-
VERSION = '1.3.0'
8+
VERSION = '2.0.0'
99
end
1010
end
1111

‎builds/check_zproject/ci_build.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
#!/usr/bin/env bash
22
set -ex
33

4-
cd $REPO_DIR/..
4+
# NOTE: This script is not standalone, it is included from project root
5+
# ci_build.sh script, which sets some envvars (like REPO_DIR below).
6+
[ -n "${REPO_DIR-}" ] || exit 1
7+
8+
# Verify all required dependencies with repos can be checked out
9+
cd "$REPO_DIR/.."
510
git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git libzmq
611
git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
712
cd -
813

914
if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list zproject >/dev/null 2>&1) || \
1015
(command -v brew >/dev/null 2>&1 && brew ls --versions zproject >/dev/null 2>&1)); then
11-
cd $REPO_DIR/..
16+
cd "$REPO_DIR/.."
1217
git clone --quiet --depth 1 https://github.com/zeromq/zproject zproject
1318
cd zproject
14-
export PATH=$PATH:`pwd`
19+
PATH="`pwd`:$PATH"
1520
fi
1621

1722
if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list generator-scripting-language >/dev/null 2>&1) || \
1823
(command -v brew >/dev/null 2>&1 && brew ls --versions gsl >/dev/null 2>&1)); then
19-
cd $REPO_DIR/..
24+
cd "$REPO_DIR/.."
2025
git clone https://github.com/imatix/gsl.git gsl
2126
cd gsl/src
2227
make
23-
export PATH=$PATH:`pwd`
28+
PATH="`pwd`:$PATH"
2429
fi
30+
export PATH
2531

32+
# Verify that zproject template is up-to-date with files it can overwrite
2633
# As we will overwrite this script file make sure bash loads the
2734
# next lines into memory before executing
2835
# http://stackoverflow.com/questions/21096478/overwrite-executing-bash-script-files
2936
{
30-
cd $REPO_DIR
37+
cd "$REPO_DIR"
3138
gsl project.xml
3239

3340
# keep an eye on git version used by CI

‎builds/check_zproto/ci_build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/usr/bin/env bash
22
set -ex
33

4+
# NOTE: This script is not standalone, it is included from project root
5+
# ci_build.sh script, which sets some envvars (like REPO_DIR below).
6+
[ -n "${REPO_DIR-}" ] || exit 1
7+
48
docker run -e GSL_BUILD_DIR=/code/src -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q zre_msg.xml
59

610
# keep an eye on git version used by CI

‎builds/cmake/ci_build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
3737
CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
3838
CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
3939
CONFIG_OPTS+=("--with-docs=no")
40-
CONFIG_OPTS+=("--quiet")
40+
if [ -z "${CI_CONFIG_QUIET-}" ] || [ "${CI_CONFIG_QUIET-}" = yes ] || [ "${CI_CONFIG_QUIET-}" = true ]; then
41+
CONFIG_OPTS+=("--quiet")
42+
fi
4143

4244
CMAKE_OPTS=()
4345
CMAKE_OPTS+=("-DCMAKE_INSTALL_PREFIX:PATH=${BUILD_PREFIX}")

‎builds/cygwin/Makefile.cygwin

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ INCDIR=-I$(PREFIX)/include -I.
1010
LIBDIR=-L$(PREFIX)/lib
1111
CFLAGS=-Wall -Os -g -DZYRE_EXPORTS $(INCDIR)
1212

13-
OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o
13+
OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o zyre_private_selftest.o
14+
1415
%.o: ../../src/%.c
1516
$(CC) -c -o $@ $< $(CFLAGS)
1617

‎builds/gyp/project.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
'../../src/zyre_peer.h',
7272
'../../include/zyre_library.h',
7373
'../../src/zyre_selftest.c',
74+
'../../src/zyre_private_selftest.c',
7475
'../../src/zyre_classes.h'
7576
],
7677
'dependencies': [

‎builds/mingw32/Makefile.mingw32

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ INCDIR=-I$(PREFIX)/include -I.
1010
LIBDIR=-L$(PREFIX)/lib
1111
CFLAGS=-Wall -Os -g -DZYRE_EXPORTS $(INCDIR)
1212

13-
OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o
13+
OBJS = zyre.o zyre_event.o zre_msg.o zyre_peer.o zyre_group.o zyre_node.o zyre_private_selftest.o
14+
1415
%.o: ../../src/%.c
1516
$(CC) -c -o $@ $< $(CFLAGS)
1617

‎builds/msvc/nuget/package.nuspec

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
99
<metadata minClientVersion="2.5">
1010
<id>zyrevc120</id>
11-
<version>1.3.0.0</version>
11+
<version>2.0.0.0</version>
1212
<title>zyrevc120</title>
1313
<authors>See AUTHORS</authors>
1414
<owners>Eric Voskuil</owners>
@@ -35,52 +35,52 @@
3535

3636
<!-- libraries -->
3737
<!-- x86 Dynamic libraries (.dll) -->
38-
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.dll" />
39-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.dll" />
38+
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.dll" />
39+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.dll" />
4040

4141
<!-- x86 Debugging symbols (.pdb) -->
42-
<!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.pdb" />-->
43-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.pdb" />
42+
<!--<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.pdb" />-->
43+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.pdb" />
4444

4545
<!-- x86 Import libraries (.imp.lib) -->
46-
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.imp.lib" />
47-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.imp.lib" />
46+
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.imp.lib" />
47+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.imp.lib" />
4848

4949
<!-- x86 Export libraries (.exp) -->
50-
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-1_3_0_0.exp" />
51-
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-gd-1_3_0_0.exp" />
50+
<file src="..\..\..\bin\Win32\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-2_0_0_0.exp" />
51+
<file src="..\..\..\bin\Win32\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x86-v120-mt-gd-2_0_0_0.exp" />
5252

5353
<!-- x86 Static libraries (.lib) -->
54-
<file src="..\..\..\bin\Win32\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-1_3_0_0.lib" />
55-
<file src="..\..\..\bin\Win32\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-1_3_0_0.lib" />
54+
<file src="..\..\..\bin\Win32\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-2_0_0_0.lib" />
55+
<file src="..\..\..\bin\Win32\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-2_0_0_0.lib" />
5656

5757
<!-- x86 Static link time code generation libraries (.ltcg.lib) -->
58-
<file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-1_3_0_0.ltcg.lib" />
59-
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-1_3_0_0.ltcg.lib" />
58+
<file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-s-2_0_0_0.ltcg.lib" />
59+
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x86-v120-mt-sgd-2_0_0_0.ltcg.lib" />
6060

6161
<!-- x64 Dynamic libraries (.dll) -->
62-
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.dll" />
63-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.dll" />
62+
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.dll" />
63+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.dll" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.dll" />
6464

6565
<!-- x64 Debugging symbols (.pdb) -->
66-
<!--<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.pdb" />-->
67-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.pdb" />
66+
<!--<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.pdb" />-->
67+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.pdb" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.pdb" />
6868

6969
<!-- x64 Import libraries (.imp.lib) -->
70-
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.imp.lib" />
71-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.imp.lib" />
70+
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.imp.lib" />
71+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.imp.lib" />
7272

7373
<!-- x64 Export libraries (.exp) -->
74-
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-1_3_0_0.exp" />
75-
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-gd-1_3_0_0.exp" />
74+
<file src="..\..\..\bin\x64\Release\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-2_0_0_0.exp" />
75+
<file src="..\..\..\bin\x64\Debug\v120\dynamic\zyre.exp" target="build\native\bin\zyre-x64-v120-mt-gd-2_0_0_0.exp" />
7676

7777
<!-- x64 Static libraries (.lib) -->
78-
<file src="..\..\..\bin\x64\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-1_3_0_0.lib" />
79-
<file src="..\..\..\bin\x64\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-1_3_0_0.lib" />
78+
<file src="..\..\..\bin\x64\Release\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-2_0_0_0.lib" />
79+
<file src="..\..\..\bin\x64\Debug\v120\static\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-2_0_0_0.lib" />
8080

8181
<!-- x64 Static link time code generation libraries (.ltcg.lib) -->
82-
<file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-1_3_0_0.ltcg.lib" />
83-
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-1_3_0_0.ltcg.lib" />
82+
<file src="..\..\..\bin\Win32\Release\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-s-2_0_0_0.ltcg.lib" />
83+
<file src="..\..\..\bin\Win32\Debug\v120\ltcg\zyre.lib" target="build\native\bin\zyre-x64-v120-mt-sgd-2_0_0_0.ltcg.lib" />
8484
</files>
8585
<!--
8686
################################################################################

0 commit comments

Comments
 (0)