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 zcmaE0{=j^L3nSyF&902yJoPOM3=BOCFu=$#mw|y{6^zTk$gqupf#E0;{}KZOgBT-B zfRW)f0|P?{5}%Ecfnf#`UyhN1;Xe}Jl97QyiV3d2o*@iXfFU1^-^R$mpoh@FFqe^m z!2pSWo{@ne5Q+bok%1u-iT|CEfgulx&&|ZZPzC4LGcw3AF)&Pr3otU6GBGgBM&f%i zF)%Dd;>R*EFf2#n7cwz0>__5vF)=V4M&d7GVqmy}#NWxp!0;W$H(_98I1A%|LxqXq z8WRJ9IhYM1m>BLcF)+A;m|)Dr@M3Z!zkIzEmQVs)Mka;>lNALNjD7OcU5kqH zix|>VOX3rAD~d~sGV{{oix`UY3W_rGO41m7{oLZ+Q%f9kD}upt44W$jwli(k7T(GM E0RJCBY5)KL delta 657 zcmaE0{=j^L3nSzA&902yJoTLn3=BOCFu=&Lh=GA&6^zTk$grD%f#E0;|2hK$gBT-B zfRW(?0|P?{5}%uqfnf#`Uzw4C;Xe}Jj*)>uiV3d2o*^1lfT0A9-_6Ltpoh@Fu!xa? z!2pSWg^__F5Q+bSk%1u-iT{U@fgulxFTljWPzC4LGcqVMF)&Pr3otTRF)=XAM&kQ1 zF)%Dd;wLdNFf2#nmoYIg>__7FGchn6M&g6iUP0pTV`5;(I`tU=qX+ z2D2c900SdKDuf9pLHr5^2DliAznzhR!5r#R0R~1UhNF`e1r#jeee%;?i;D7#7~<1Y zOX3rAD~d~sGV{{oix}dI^9qVG^Gebf;(h(x;@wkA9CIsz!LkhTn@a??Gi^2y-oOC> DQ=>!q 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() {