Browse Source

Win X64 changes on visual studio

Tested on Win 7 x64, this changes introduced pthread static linking,
static linking of win libs and successful run of win x64 iguana
dPoW2
usamir 8 years ago
parent
commit
1dfce58f03
  1. 1
      OSlibs/win/mingw.h
  2. BIN
      OSlibs/win/x64/pthread_lib.lib
  3. 1
      crypto777/OS_portable.h
  4. 18
      iguana.vcxproj
  5. 9
      iguana.vcxproj.filters

1
OSlibs/win/mingw.h

@ -6,6 +6,7 @@
#define _USE_W32_SOCKETS 1
#include <windows.h>
#define PTW32_STATIC_LIB
#include "pthread.h"
#ifndef NATIVE_WINDOWS

BIN
OSlibs/win/x64/pthread_lib.lib

Binary file not shown.

1
crypto777/OS_portable.h

@ -44,6 +44,7 @@
#define sleep(x) Sleep(1000*(x))
#include "../OSlibs/win/mingw.h"
#include "../OSlibs/win/mman.h"
#define PTW32_STATIC_LIB
#include "../OSlibs/win/pthread.h"
#ifndef NATIVE_WINDOWS

18
iguana.vcxproj

@ -51,6 +51,7 @@
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -81,6 +82,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -137,15 +139,16 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StructMemberAlignment>1Byte</StructMemberAlignment>
<PreprocessorDefinitions>WIN64;_WIN64;_CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StructMemberAlignment>8Bytes</StructMemberAlignment>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Advapi32.lib;$(SolutionDir)OSlibs\win\x64\pthread_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@ -282,15 +285,6 @@
<ClCompile Include="iguana\SuperNET_keys.c" />
<ClCompile Include="OSlibs\win\mingw.c" />
</ItemGroup>
<ItemGroup>
<Library Include="pthreadVC2.lib" />
<Library Include="OSlibs\win\libpthreadGC2.a" />
<Library Include="OSlibs\win\libpthreadGC2_64.a" />
</ItemGroup>
<ItemGroup>
<None Include="pthreadvc2.dll" />
<None Include="ucrtbased.dll" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

9
iguana.vcxproj.filters

@ -131,15 +131,6 @@
<ClInclude Include="OSlibs\win\pthread.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<Library Include="pthreadVC2.lib" />
<Library Include="OSlibs\win\libpthreadGC2.a" />
<Library Include="OSlibs\win\libpthreadGC2_64.a" />
</ItemGroup>
<ItemGroup>
<None Include="pthreadvc2.dll" />
<None Include="ucrtbased.dll" />
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>

Loading…
Cancel
Save