diff --git a/engine/Makefile b/engine/Makefile index 7227f6242..6a6fa4bc2 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -57,6 +57,15 @@ DROID_NDK_PATH?=~/droid/android-ndk-r6b DROID_SDK_PATH?=~/droid/android-sdk-linux_x86 ANT?=ant JAVATOOL="$(JAVA_HOME)"/bin/ + +ifeq ($(WHOAMI),moodles) + ANT_HOME=/home/moodles/apache-ant-1.8.2/ + JAVA_HOME=/home/moodles/jdk1.6.0_25/ + DROID_NDK_PATH=/home/moodles/android_ndk + DROID_SDK_PATH=/home/moodles/android_sdk + JARSIGNARGS="-storepass fteqw1" +endif + ifeq ($(DROID_ARCH),) DROID_ARCH=armeabi endif @@ -296,7 +305,7 @@ ifeq ($(shell echo $(FTE_TARGET)|grep -v win),) ifeq ($(shell echo $(FTE_TARGET)|grep -v -i _SDL),) RELEASE_CFLAGS+= -D_SDL - SDL_LDFLAGS=$(MINGW_LIBS_DIR)/libSDL.a $(MINGW_LIBS_DIR)/libSDLmain.a + SDL_LDFLAGS=$(MINGW_LIBS_DIR)/libSDL.a $(MINGW_LIBS_DIR)/libSDLmain.a -L./libs/mingw64-libs endif endif diff --git a/engine/botlib/be_aas_main.c b/engine/botlib/be_aas_main.c index 091dd4c0d..22552970c 100644 --- a/engine/botlib/be_aas_main.c +++ b/engine/botlib/be_aas_main.c @@ -44,6 +44,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "be_interface.h" #include "be_aas_def.h" +#ifdef _WIN64 + #ifdef _SDL + #define vsnprintf linuxlike_vsnprintf + #endif +#endif + aas_t aasworld; libvar_t *saveroutingcache; diff --git a/engine/botlib/l_precomp.c b/engine/botlib/l_precomp.c index c94cfcb51..9f3de6074 100644 --- a/engine/botlib/l_precomp.c +++ b/engine/botlib/l_precomp.c @@ -109,6 +109,12 @@ typedef struct directive_s #define TOKEN_HEAP_SIZE 4096 +#ifdef _WIN64 + #ifdef _SDL + #define vsnprintf linuxlike_vsnprintf + #endif +#endif + int numtokens; /* int tokenheapinitialized; //true when the token heap is initialized diff --git a/engine/botlib/l_script.c b/engine/botlib/l_script.c index 4ed93cd14..f5b6a7df0 100644 --- a/engine/botlib/l_script.c +++ b/engine/botlib/l_script.c @@ -168,11 +168,7 @@ char basefolder[MAX_QPATH]; #ifdef _WIN64 #ifdef _SDL - #define snprintf linuxlike_snprintf - int VARGS linuxlike_snprintf(char *buffer, int size, const char *format, ...) LIKEPRINTF(3); #define vsnprintf linuxlike_vsnprintf - int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr); - //void *__imp__vsnprintf = vsnprintf; #endif #endif