Skip to content

Commit 746a746

Browse files
ccw808ccw808
committed
Update to r5844 (Fixed #7838 (Server crashes very often with 1.3.4-5838))
1 parent bad8899 commit 746a746

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎mak.vs2008/lua5.1c_dll.vcproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@
7070
Name="VCLinkerTool"
7171
OutputFile="C:\Program Files\MTA San Andreas 1.4\mods\deathmatch\lua5.1c_d.dll"
7272
LinkIncremental="2"
73-
AdditionalLibraryDirectories="../lib"
73+
AdditionalLibraryDirectories=""
7474
ModuleDefinitionFile=""
7575
GenerateDebugInformation="true"
7676
ProgramDatabaseFile="$(OutDir)/lua5.1c.pdb"
7777
SubSystem="2"
7878
RandomizedBaseAddress="1"
7979
DataExecutionPrevention="0"
80-
ImportLibrary="../lib/lua5.1c_d.lib"
80+
ImportLibrary="../lib/lua5.1c_dll/lua5.1c_d.lib"
8181
TargetMachine="1"
8282
/>
8383
<Tool
@@ -155,7 +155,7 @@
155155
Name="VCLinkerTool"
156156
OutputFile="C:\Program Files\MTA San Andreas 1.4\mods\deathmatch\lua5.1c.dll"
157157
LinkIncremental="1"
158-
AdditionalLibraryDirectories="../lib"
158+
AdditionalLibraryDirectories=""
159159
ModuleDefinitionFile=""
160160
GenerateDebugInformation="true"
161161
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeInputName).pdb"
@@ -167,7 +167,7 @@
167167
EnableCOMDATFolding="2"
168168
RandomizedBaseAddress="1"
169169
DataExecutionPrevention="0"
170-
ImportLibrary="../lib/lua5.1c.lib"
170+
ImportLibrary="../lib/lua5.1c_dll/lua5.1c.lib"
171171
TargetMachine="1"
172172
/>
173173
<Tool
@@ -244,7 +244,7 @@
244244
Name="VCLinkerTool"
245245
OutputFile="..\..\..\output\MTA San Andreas\mods\deathmatch\lua5.1c.dll"
246246
LinkIncremental="1"
247-
AdditionalLibraryDirectories="../lib"
247+
AdditionalLibraryDirectories=""
248248
ModuleDefinitionFile=""
249249
GenerateDebugInformation="true"
250250
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeInputName).pdb"
@@ -256,7 +256,7 @@
256256
EnableCOMDATFolding="2"
257257
RandomizedBaseAddress="1"
258258
DataExecutionPrevention="0"
259-
ImportLibrary="../lib/lua5.1c.lib"
259+
ImportLibrary="../lib/lua5.1c_dll/lua5.1c.lib"
260260
TargetMachine="1"
261261
/>
262262
<Tool

‎mak.vs2008/lua5.1_dll.vcproj‎ renamed to ‎mak.vs2008/lua5.1s_dll.vcproj‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<VisualStudioProject
33
ProjectType="Visual C++"
44
Version="9.00"
5-
Name="lua5.1_dll"
5+
Name="lua5.1s_dll"
66
ProjectGUID="{8EEECEE6-A6EC-BC48-8E76-22B87825444B}"
7-
RootNamespace="lua5.1_dll"
7+
RootNamespace="lua5.1s_dll"
88
Keyword="Win32Proj"
99
TargetFrameworkVersion="131072"
1010
>
@@ -19,7 +19,7 @@
1919
<Configuration
2020
Name="Debug|Win32"
2121
OutputDirectory="../../"
22-
IntermediateDirectory="../obj/lua5.1_dll/Debug"
22+
IntermediateDirectory="../obj/lua5.1s_dll/Debug"
2323
ConfigurationType="2"
2424
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
2525
CharacterSet="2"
@@ -68,16 +68,16 @@
6868
/>
6969
<Tool
7070
Name="VCLinkerTool"
71-
OutputFile="C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\lua5.1_d.dll"
71+
OutputFile="C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\lua5.1s_d.dll"
7272
LinkIncremental="2"
73-
AdditionalLibraryDirectories="../lib"
73+
AdditionalLibraryDirectories=""
7474
ModuleDefinitionFile=""
7575
GenerateDebugInformation="true"
76-
ProgramDatabaseFile="$(OutDir)/lua5.1.pdb"
76+
ProgramDatabaseFile="$(OutDir)/lua5.1s.pdb"
7777
SubSystem="2"
7878
RandomizedBaseAddress="1"
7979
DataExecutionPrevention="0"
80-
ImportLibrary="../lib/lua5.1_d.lib"
80+
ImportLibrary="../lib/lua5.1s_dll/lua5.1s_d.lib"
8181
TargetMachine="1"
8282
/>
8383
<Tool
@@ -106,7 +106,7 @@
106106
<Configuration
107107
Name="Release|Win32"
108108
OutputDirectory="../../"
109-
IntermediateDirectory="../obj/lua5.1_dll/Release"
109+
IntermediateDirectory="../obj/lua5.1s_dll/Release"
110110
ConfigurationType="2"
111111
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
112112
CharacterSet="2"
@@ -153,21 +153,21 @@
153153
/>
154154
<Tool
155155
Name="VCLinkerTool"
156-
OutputFile="C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\lua5.1.dll"
156+
OutputFile="C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\lua5.1s.dll"
157157
LinkIncremental="1"
158-
AdditionalLibraryDirectories="../lib"
158+
AdditionalLibraryDirectories=""
159159
ModuleDefinitionFile=""
160160
GenerateDebugInformation="true"
161-
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeParentName).pdb"
161+
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeInputName).pdb"
162162
GenerateMapFile="true"
163-
MapFileName="../../../symbols/$(ConfigurationName)_$(SafeParentName).map"
163+
MapFileName="../../../symbols/$(ConfigurationName)_$(SafeInputName).map"
164164
MapExports="true"
165165
SubSystem="2"
166166
OptimizeReferences="2"
167167
EnableCOMDATFolding="2"
168168
RandomizedBaseAddress="1"
169169
DataExecutionPrevention="0"
170-
ImportLibrary="../lib/lua5.1.lib"
170+
ImportLibrary="../lib/lua5.1s_dll/lua5.1s.lib"
171171
TargetMachine="1"
172172
/>
173173
<Tool
@@ -196,7 +196,7 @@
196196
<Configuration
197197
Name="Nightly|Win32"
198198
OutputDirectory="../../"
199-
IntermediateDirectory="..\..\..\obj\vendor\lua51_dll"
199+
IntermediateDirectory="..\..\..\obj\vendor\lua51s_dll"
200200
ConfigurationType="2"
201201
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
202202
CharacterSet="2"
@@ -242,21 +242,21 @@
242242
/>
243243
<Tool
244244
Name="VCLinkerTool"
245-
OutputFile="..\..\..\output\MTA San Andreas\server\mods\deathmatch\lua5.1.dll"
245+
OutputFile="..\..\..\output\MTA San Andreas\server\mods\deathmatch\lua5.1s.dll"
246246
LinkIncremental="1"
247-
AdditionalLibraryDirectories="../lib"
247+
AdditionalLibraryDirectories=""
248248
ModuleDefinitionFile=""
249249
GenerateDebugInformation="true"
250-
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeParentName).pdb"
250+
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeInputName).pdb"
251251
GenerateMapFile="true"
252-
MapFileName="../../../symbols/$(ConfigurationName)_$(SafeParentName).map"
252+
MapFileName="../../../symbols/$(ConfigurationName)_$(SafeInputName).map"
253253
MapExports="true"
254254
SubSystem="2"
255255
OptimizeReferences="2"
256256
EnableCOMDATFolding="2"
257257
RandomizedBaseAddress="1"
258258
DataExecutionPrevention="0"
259-
ImportLibrary="../lib/lua5.1.lib"
259+
ImportLibrary="../lib/lua5.1s_dll/lua5.1s.lib"
260260
TargetMachine="1"
261261
/>
262262
<Tool

0 commit comments

Comments
 (0)