diff options
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/msvc/Makefile.am | 4 | ||||
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 2 | ||||
| -rw-r--r-- | builds/msvc/platform.hpp | 16 | ||||
| -rw-r--r-- | builds/msvc/properties/WithOpenPGM.props | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index 52331cb..8b16ccc 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -1,4 +1,4 @@ -LIBZMQ_DIST = libzmq/libzmq.vcproj libzmq/libzmq.vcxproj \ +LIBXS_DIST = libzmq/libzmq.vcproj libzmq/libzmq.vcxproj \ libzmq/libzmq.vcxproj.filters \ platform.hpp msvc.sln msvc10.sln @@ -30,4 +30,4 @@ PROPERTIES_DIST = properties/Common.props \ PRECOMPILED_DIST = ../../src/precompiled.hpp \ ../../src/precompiled.cpp -EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) +EXTRA_DIST = $(LIBXS_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index f93b422..71d6af0 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -190,7 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../OpenPGM/include" - PreprocessorDefinitions="ZMQ_HAVE_OPENPGM" + PreprocessorDefinitions="XS_HAVE_OPENPGM" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp index 4af872c..e8a3324 100644 --- a/builds/msvc/platform.hpp +++ b/builds/msvc/platform.hpp @@ -1,15 +1,16 @@ /* + Copyright (c) 2012 250bpm s.r.o. Copyright (c) 2007-2011 iMatix Corporation Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file - This file is part of 0MQ. + This file is part of Crossroads project. - 0MQ is free software; you can redistribute it and/or modify it under + Crossroads is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - 0MQ is distributed in the hope that it will be useful, + Crossroads is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,15 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__ -#define __ZMQ_PLATFORM_HPP_INCLUDED__ +#ifndef __XS_PLATFORM_HPP_INCLUDED__ +#define __XS_PLATFORM_HPP_INCLUDED__ // This is the platform definition for the MSVC platform. // As a first step of the build process it is copied to -// zmq directory to take place of platform.hpp generated from +// src directory to take place of platform.hpp generated from // platform.hpp.in on platforms supported by GNU autotools. -// Place any MSVC-specific definitions here. -#define ZMQ_HAVE_WINDOWS +#define XS_HAVE_WINDOWS #endif diff --git a/builds/msvc/properties/WithOpenPGM.props b/builds/msvc/properties/WithOpenPGM.props index c920f58..2db4b14 100644 --- a/builds/msvc/properties/WithOpenPGM.props +++ b/builds/msvc/properties/WithOpenPGM.props @@ -6,7 +6,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <PreprocessorDefinitions>ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XS_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> -</Project>
\ No newline at end of file +</Project> |