Skip to content

Commit 69045a8

Browse files
teschneiteschnei
committed
Fixed various issues with running 64-bit builds
1 parent 8743eff commit 69045a8

12 files changed

+27
-5
lines changed

‎lib/libzmq-d.lib

130 Bytes
Binary file not shown.

‎lib64/libzmq-d_64.lib

328 Bytes
Binary file not shown.

‎lib64/libzmq_64.lib

198 Bytes
Binary file not shown.

‎lib64/lua51_64.lib

442 Bytes
Binary file not shown.

‎libzmq-d.dll

0 Bytes
Binary file not shown.

‎libzmq-d_64.dll

0 Bytes
Binary file not shown.

‎libzmq_64.dll

0 Bytes
Binary file not shown.

‎lua51_64.dll

0 Bytes
Binary file not shown.

‎win32/DSConnect-server/DSConnect-server.vcxproj

+8-5
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<ProjectGuid>{E50EB22C-08C8-4FDA-91AD-DE5062AF5619}</ProjectGuid>
7373
<Keyword>Win32Proj</Keyword>
7474
<RootNamespace>DSConnectserver</RootNamespace>
75+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
7576
</PropertyGroup>
7677
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
7778
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -123,6 +124,7 @@
123124
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
124125
<LinkIncremental>true</LinkIncremental>
125126
<OutDir>..\..\</OutDir>
127+
<TargetName>$(ProjectName)_64</TargetName>
126128
</PropertyGroup>
127129
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
128130
<LinkIncremental>false</LinkIncremental>
@@ -131,6 +133,7 @@
131133
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
132134
<LinkIncremental>false</LinkIncremental>
133135
<OutDir>..\..\</OutDir>
136+
<TargetName>$(ProjectName)_64</TargetName>
134137
</PropertyGroup>
135138
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
136139
<ClCompile>
@@ -139,7 +142,7 @@
139142
<WarningLevel>Level3</WarningLevel>
140143
<Optimization>Disabled</Optimization>
141144
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;dsTCPSERV;DEBUGLOGLOGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142-
<AdditionalIncludeDirectories>$(ProjectDir)..\external;$(ProjectDir)..\external\mysql;$(ProjectDir)..\external\zmq;</AdditionalIncludeDirectories>
145+
<AdditionalIncludeDirectories>$(ProjectDir)..\external;$(ProjectDir)..\external\mysql;$(ProjectDir)..\external\zmq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
143146
</ClCompile>
144147
<Link>
145148
<SubSystem>Console</SubSystem>
@@ -156,12 +159,12 @@
156159
<WarningLevel>Level3</WarningLevel>
157160
<Optimization>Disabled</Optimization>
158161
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;dsTCPSERV;DEBUGLOGLOGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159-
<AdditionalIncludeDirectories>$(ProjectDir)..\external;$(ProjectDir)..\external\mysql;</AdditionalIncludeDirectories>
162+
<AdditionalIncludeDirectories>$(ProjectDir)..\external;$(ProjectDir)..\external\mysql;$(ProjectDir)..\external\zmq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
160163
</ClCompile>
161164
<Link>
162165
<SubSystem>Console</SubSystem>
163166
<GenerateDebugInformation>true</GenerateDebugInformation>
164-
<AdditionalDependencies>libmariadb64.lib;WS2_32.Lib;</AdditionalDependencies>
167+
<AdditionalDependencies>libmariadb64.lib;libzmq-d_64.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
165168
<AdditionalLibraryDirectories>..\..\lib64</AdditionalLibraryDirectories>
166169
<OutputFile>$(OutDir)$(ProjectName)_64$(TargetExt)</OutputFile>
167170
<IgnoreSpecificDefaultLibraries>
@@ -198,7 +201,7 @@
198201
<FunctionLevelLinking>true</FunctionLevelLinking>
199202
<IntrinsicFunctions>true</IntrinsicFunctions>
200203
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;dsTCPSERV;DEBUGLOGLOGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
201-
<AdditionalIncludeDirectories>$(ProjectDir)..\external;$(ProjectDir)..\external\mysql;</AdditionalIncludeDirectories>
204+
<AdditionalIncludeDirectories>$(ProjectDir)..\external;$(ProjectDir)..\external\mysql;$(ProjectDir)..\external\zmq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
202205
</ClCompile>
203206
<Link>
204207
<SubSystem>Console</SubSystem>
@@ -207,7 +210,7 @@
207210
<OptimizeReferences>true</OptimizeReferences>
208211
<OutputFile>$(OutDir)$(ProjectName)_64$(TargetExt)</OutputFile>
209212
<AdditionalLibraryDirectories>..\..\lib64</AdditionalLibraryDirectories>
210-
<AdditionalDependencies>libmariadb64.lib;WS2_32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
213+
<AdditionalDependencies>libmariadb64.lib;lua51_64.lib;libzmq_64.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
211214
<IgnoreSpecificDefaultLibraries>
212215
</IgnoreSpecificDefaultLibraries>
213216
</Link>

‎win32/DSConnect-server/DSConnect-server.vcxproj.user

+8
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,12 @@
1010
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1111
<LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
1212
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
14+
<LocalDebuggerWorkingDirectory>$(MSBuildProjectDirectory)\..\..\</LocalDebuggerWorkingDirectory>
15+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
18+
<LocalDebuggerWorkingDirectory>$(MSBuildProjectDirectory)\..\..\</LocalDebuggerWorkingDirectory>
19+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
20+
</PropertyGroup>
1321
</Project>

‎win32/DSSearch-server/DSSearch-server.vcxproj

+3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<ProjectGuid>{5C763F9B-F332-434F-9EE6-B64B15E1E520}</ProjectGuid>
7373
<Keyword>Win32Proj</Keyword>
7474
<RootNamespace>DSSearchserver</RootNamespace>
75+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
7576
</PropertyGroup>
7677
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
7778
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -124,6 +125,7 @@
124125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
125126
<LinkIncremental>true</LinkIncremental>
126127
<OutDir>..\..\</OutDir>
128+
<TargetName>$(ProjectName)_64</TargetName>
127129
</PropertyGroup>
128130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
129131
<LinkIncremental>false</LinkIncremental>
@@ -132,6 +134,7 @@
132134
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
133135
<LinkIncremental>false</LinkIncremental>
134136
<OutDir>..\..\</OutDir>
137+
<TargetName>$(ProjectName)_64</TargetName>
135138
</PropertyGroup>
136139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
137140
<ClCompile>

‎win32/DSSearch-server/DSSearch-server.vcxproj.user

+8
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,12 @@
1414
<LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
1515
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1616
</PropertyGroup>
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
18+
<LocalDebuggerWorkingDirectory>$(MSBuildProjectDirectory)\..\..\</LocalDebuggerWorkingDirectory>
19+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
20+
</PropertyGroup>
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
22+
<LocalDebuggerWorkingDirectory>$(MSBuildProjectDirectory)\..\..\</LocalDebuggerWorkingDirectory>
23+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
24+
</PropertyGroup>
1725
</Project>

0 commit comments

Comments
 (0)