Changeset 2874


Ignore:
Timestamp:
Feb 16, 2020 8:01:44 PM (22 months ago)
Author:
unxusr
Message:

visual studio C interface DLL fixes

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/MSVisualStudio/v16/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj

    r2829 r2874  
    150150      <PrecompiledHeader>
    151151      </PrecompiledHeader>
     152      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    152153    </ClCompile>
    153154    <Link>
  • trunk/MSVisualStudio/v16/cbc/cbc.vcxproj

    r2868 r2874  
    196196      <PreprocessorDefinitions>NDEBUG;_NDEBUG;CBC_BUILD;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    197197      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     198      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    198199    </ClCompile>
    199200    <Link>
  • trunk/MSVisualStudio/v16/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj

    r2868 r2874  
    193193      <ConformanceMode>true</ConformanceMode>
    194194      <AdditionalIncludeDirectories>..\..\..\..\Cgl\src\CglAllDifferent;..\..\..\..\Cgl\src\CglBKClique;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglCliqueMerging;..\..\..\..\Cgl\src\CglCommon;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\srcCglLiftAndProject;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglOddHoleWC;..\..\..\..\Cgl\srcCglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    195       <PreprocessorDefinitions>NDEBUG;_NDEBUG;CBC_BUILD;WIN32;_WINDOWS;_USRDLL;CBCCINTERFACEDLL_EXPORTS;_WINDLL;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
    196       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     195      <PreprocessorDefinitions>NDEBUG;_NDEBUG;CBC_BUILD;WIN32;_WIN32;_WINDOWS;_USRDLL;_WINDLL;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CBCCINTERFACEDLL_EXPORTS</PreprocessorDefinitions>
     196      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     197      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    197198    </ClCompile>
    198199    <Link>
  • trunk/MSVisualStudio/v16/libCbc/libCbc.vcxproj

    r2868 r2874  
    177177      <PreprocessorDefinitions>NDEBUG;_NDEBUG;CBC_BUILD;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    178178      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     179      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    179180    </ClCompile>
    180181    <Link>
  • trunk/MSVisualStudio/v16/libCbcSolver/libCbcSolver.vcxproj

    r2868 r2874  
    177177      <PreprocessorDefinitions>NDEBUG;_NDEBUG;CBC_BUILD;WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    178178      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     179      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    179180    </ClCompile>
    180181    <Link>
  • trunk/MSVisualStudio/v16/libOsiCbc/libOsiCbc.vcxproj

    r2829 r2874  
    127127      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    128128      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     129      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    129130    </ClCompile>
    130131  </ItemDefinitionGroup>
  • trunk/src/Cbc_C_Interface.cpp

    r2872 r2874  
    1515#include <pthread.h>
    1616#endif
    17 
     17 
    1818#include "CoinPragma.hpp"
    1919//#include "CoinHelperFunctions.hpp"
     
    655655  return CBC_VERSION;
    656656}
    657 
     657 
    658658enum FlushContents
    659659{
  • trunk/src/Cbc_C_Interface.h

    r2870 r2874  
    1010
    1111/* include all defines and ugly stuff */
     12#include "CbcSolverConfig.h"
    1213#include "Coin_C_defines.h"
    13 #include "CbcSolverConfig.h"
    14 #undef COINLIBAPI
    15 #define COINLIBAPI CBCSOLVERLIB_EXPORT
    1614
    1715#include <stddef.h>
Note: See TracChangeset for help on using the changeset viewer.