Skip to content

Commit 18b8a17

Browse files
committed
Remove amx ASM32 define
1 parent 05766f0 commit 18b8a17

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

amx-deps/src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CPP = gcc
1010
# Compiler flags
1111
# NOTE: add -g for debug, remove for release!
1212
ASMFLAGS = -O1 -f elf -I./amx/
13-
CPPFLAGS = -MD -O2 -Wall -I./ -I/usr/local/include/boost-1_35 -I./amx -I./include -I./linux -DAMX_DONT_RELOCATE -DFLOATPOINT -DASM32
13+
CPPFLAGS = -MD -O2 -Wall -I./ -I/usr/local/include/boost-1_35 -I./amx -I./include -I./linux -DAMX_DONT_RELOCATE -DFLOATPOINT
1414
LDFLAGS = -fPIC -s -shared -Wl,-soname,$(PROG).1,-R./
1515
LIBS = -lpthread -lstdc++ -llua5.1 -lsqlite3 -lboost_filesystem-gcc41-mt-s -lboost_system-gcc41-mt-s
1616

amx-deps/src/amx/amxexec.obj

-18.5 KB
Binary file not shown.

amx-deps/src/ml_base.vcxproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<ClCompile>
6464
<Optimization>Disabled</Optimization>
6565
<AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
66-
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;__WIN32__;AMX_DONT_RELOCATE;FLOATPOINT;ASM32;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
66+
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;__WIN32__;AMX_DONT_RELOCATE;FLOATPOINT;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
6767
<MinimalRebuild>true</MinimalRebuild>
6868
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6969
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -79,7 +79,6 @@
7979
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8080
</ResourceCompile>
8181
<Link>
82-
<AdditionalOptions>amx\amxexec.obj %(AdditionalOptions)</AdditionalOptions>
8382
<AdditionalDependencies>./lib/lua5.1.lib;./lib/sqlite3.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
8483
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
8584
<ModuleDefinitionFile />
@@ -101,7 +100,7 @@
101100
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
102101
<OmitFramePointers>true</OmitFramePointers>
103102
<AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;__WIN32__;AMX_DONT_RELOCATE;FLOATPOINT;ASM32;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
103+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;__WIN32__;AMX_DONT_RELOCATE;FLOATPOINT;%(PreprocessorDefinitions);HAVE_INTTYPES_H;HAVE_MALLOC_H;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
105104
<StringPooling>true</StringPooling>
106105
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
107106
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -116,7 +115,6 @@
116115
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
117116
</ResourceCompile>
118117
<Link>
119-
<AdditionalOptions>amx\amxexec.obj %(AdditionalOptions)</AdditionalOptions>
120118
<AdditionalDependencies>./lib/lua5.1.lib;./lib/sqlite3.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
121119
<ModuleDefinitionFile />
122120
<GenerateDebugInformation>true</GenerateDebugInformation>

0 commit comments

Comments
 (0)