From f1a4cfee6176ffbb02bf00e061c267178a55af96 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 14 Feb 2006 15:13:26 +0000 Subject: [PATCH] compilable now o_O --- amxmodx/JIT/helpers-x86.o | Bin 7136 -> 7136 bytes amxmodx/Makefile | 1 + amxmodx/helpers-x86.asm | 6 +++++- amxmodx/meta_api.cpp | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/amxmodx/JIT/helpers-x86.o b/amxmodx/JIT/helpers-x86.o index cf5071f1495e1751fc14677e8b8b646aec311f61..22b30d8019ac73d37f30de5553ce1731647f9ae0 100644 GIT binary patch delta 652 zcmZ9|F-XHu6oujQGKipHKyc_#byX0dN^lffi=YKj+$1{0(4mPY8LCSV#6i1tP>>F~ z2u@;AaZ(UR5kwrN;3BxWbksv_;%x#C{_lndkJ~UB#zj`C?|M!h^oF|tDm;ImLXB}A z5enDrN8uOtfQkkRU(6-pF7}adn*Ad@#ZGDQ{SeEY1GowA(PRG?P@~6%pXmkR54tGa zq#fZN_IB)0Ax#{{1BFTUvG6SWM0kaLCcMeM6W(V(2%oZFg>Tu-$P--gQ-s!5G`!J9 zv>|ACr}M&})t$bR0l{X>0AztQTW{a4+;{~tkW delta 657 zcmZ9|u}i~16vy#*Hwg*`1P2{dx{7oVBMyRKt%DY%ZVrb+3>}(EdPr~yj#9y)g9RtM z2u_6z9RwYu|9})6Tna8Of?F3se^xKPULf%OyyW0`J-6q!)`jRNIZ+#n&xq(8@9!h1 ziMTZ+L3ij5^D}x!{q_ztiD(~sFa#S3AC6#EWEtBj-YvdbKqeJ-s diff --git a/amxmodx/Makefile b/amxmodx/Makefile index 89b27dee..98cb15a9 100755 --- a/amxmodx/Makefile +++ b/amxmodx/Makefile @@ -45,6 +45,7 @@ ifeq "$(AMD64)" "true" else BINARY = $(NAME)_i386.so OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o + OBJECTS += JIT/helpers-x86.o CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 OPT_FLAGS += -march=i586 endif diff --git a/amxmodx/helpers-x86.asm b/amxmodx/helpers-x86.asm index afe71e60..6b7f9297 100644 --- a/amxmodx/helpers-x86.asm +++ b/amxmodx/helpers-x86.asm @@ -8,7 +8,11 @@ section .text %ifdef LINUX -%define __snprintf _snprintf +%define __snprintf snprintf +%define _get_amxstring_r get_amxstring_r +%define _MNF_GetAmxString MNF_GetAmxString +%define _translate translate +%define _LogError LogError %endif extern _LogError, _get_amxstring_r, __snprintf, _MNF_GetAmxString diff --git a/amxmodx/meta_api.cpp b/amxmodx/meta_api.cpp index 0d29ddb9..53b7cea1 100755 --- a/amxmodx/meta_api.cpp +++ b/amxmodx/meta_api.cpp @@ -1145,7 +1145,7 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_ } #if !defined AMD64 -extern "C" init_format_jumps(); +extern "C" void init_format_jumps(); #else void init_format_jumps() {