Skip to content

Commit 64588f1

Browse files
committed
Added client specific Lua dll to avoid problems with map editor.
Changed Lua back to using __declspec(dllexport) instead of a .def file.
1 parent 2f443ec commit 64588f1

File tree

16 files changed

+556
-153
lines changed

16 files changed

+556
-153
lines changed

mak.vs2008/lua5.1_dll.vcproj

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Name="VCCLCompilerTool"
4444
Optimization="0"
4545
AdditionalIncludeDirectories="../../../Shared/publicsdk/lua/include"
46-
PreprocessorDefinitions="LUA_USE_APICHECK"
46+
PreprocessorDefinitions="LUA_USE_APICHECK;LUA_BUILD_AS_DLL"
4747
StringPooling="true"
4848
MinimalRebuild="true"
4949
BasicRuntimeChecks="3"
@@ -68,16 +68,16 @@
6868
/>
6969
<Tool
7070
Name="VCLinkerTool"
71-
OutputFile="$(OutDir)/lua5.1d.dll"
71+
OutputFile="C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\lua5.1_d.dll"
7272
LinkIncremental="2"
7373
AdditionalLibraryDirectories="../lib"
74-
ModuleDefinitionFile="../src/lua5.1.def"
74+
ModuleDefinitionFile=""
7575
GenerateDebugInformation="true"
7676
ProgramDatabaseFile="$(OutDir)/lua5.1.pdb"
7777
SubSystem="2"
7878
RandomizedBaseAddress="1"
7979
DataExecutionPrevention="0"
80-
ImportLibrary="../lib/lua5.1d.lib"
80+
ImportLibrary="../lib/lua5.1_d.lib"
8181
TargetMachine="1"
8282
/>
8383
<Tool
@@ -100,7 +100,7 @@
100100
/>
101101
<Tool
102102
Name="VCPostBuildEventTool"
103-
CommandLine="xcopy /y ..\..\lua5.1d.dll &quot;C:\Program Files\MTA San Andreas 1.4\mods\deathmatch\&quot; &amp;&amp; xcopy /y ..\..\lua5.1d.dll &quot;C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\&quot;"
103+
CommandLine=""
104104
/>
105105
</Configuration>
106106
<Configuration
@@ -130,6 +130,7 @@
130130
Name="VCCLCompilerTool"
131131
Optimization="2"
132132
AdditionalIncludeDirectories="../../../Shared/publicsdk/lua/include"
133+
PreprocessorDefinitions="LUA_BUILD_AS_DLL"
133134
StringPooling="true"
134135
RuntimeLibrary="2"
135136
EnableFunctionLevelLinking="true"
@@ -152,10 +153,10 @@
152153
/>
153154
<Tool
154155
Name="VCLinkerTool"
155-
OutputFile="$(OutDir)/lua5.1.dll"
156+
OutputFile="C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\lua5.1.dll"
156157
LinkIncremental="1"
157158
AdditionalLibraryDirectories="../lib"
158-
ModuleDefinitionFile="../src/lua5.1.def"
159+
ModuleDefinitionFile=""
159160
GenerateDebugInformation="true"
160161
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeParentName).pdb"
161162
GenerateMapFile="true"
@@ -189,7 +190,7 @@
189190
/>
190191
<Tool
191192
Name="VCPostBuildEventTool"
192-
CommandLine="xcopy /y ..\..\lua5.1.dll &quot;C:\Program Files\MTA San Andreas 1.4\mods\deathmatch\&quot; &amp;&amp; xcopy /y ..\..\lua5.1.dll &quot;C:\Program Files\MTA San Andreas 1.4\server\mods\deathmatch\&quot;"
193+
CommandLine=""
193194
/>
194195
</Configuration>
195196
<Configuration
@@ -219,6 +220,7 @@
219220
Name="VCCLCompilerTool"
220221
Optimization="2"
221222
AdditionalIncludeDirectories="../../../Shared/publicsdk/lua/include"
223+
PreprocessorDefinitions="LUA_BUILD_AS_DLL"
222224
StringPooling="true"
223225
RuntimeLibrary="2"
224226
EnableFunctionLevelLinking="true"
@@ -240,10 +242,10 @@
240242
/>
241243
<Tool
242244
Name="VCLinkerTool"
243-
OutputFile="$(OutDir)/lua5.1.dll"
245+
OutputFile="..\..\..\output\MTA San Andreas\server\mods\deathmatch\lua5.1.dll"
244246
LinkIncremental="1"
245247
AdditionalLibraryDirectories="../lib"
246-
ModuleDefinitionFile="../src/lua5.1.def"
248+
ModuleDefinitionFile=""
247249
GenerateDebugInformation="true"
248250
ProgramDatabaseFile="../../../symbols/$(ConfigurationName)_$(SafeParentName).pdb"
249251
GenerateMapFile="true"
@@ -277,7 +279,7 @@
277279
/>
278280
<Tool
279281
Name="VCPostBuildEventTool"
280-
CommandLine="xcopy /y ..\..\lua5.1.dll &quot;..\..\..\output\MTA San Andreas\mods\deathmatch\&quot; &amp;&amp; xcopy /y ..\..\lua5.1.dll &quot;..\..\..\output\MTA San Andreas\server\mods\deathmatch\&quot;"
282+
CommandLine=""
281283
/>
282284
</Configuration>
283285
</Configurations>
@@ -391,10 +393,6 @@
391393
RelativePath="..\src\ltm.c"
392394
>
393395
</File>
394-
<File
395-
RelativePath="..\src\lua5.1.def"
396-
>
397-
</File>
398396
<File
399397
RelativePath="..\src\lundump.c"
400398
>

0 commit comments

Comments
 (0)