From b4828e420b343e59500ec54dedf12bc665e3ae88 Mon Sep 17 00:00:00 2001 From: bloke Date: Mon, 10 Sep 2018 22:46:12 +0200 Subject: [PATCH 1/2] ifeq ($(TARGET_OS),mingw32) fails on my mingw versions. cod4x server also uses Windows_NT to detect windows --- makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 19ece38..8924ba2 100644 --- a/makefile +++ b/makefile @@ -33,7 +33,7 @@ OBJECTS=$(C_OBJECTS) $(CPP_OBJECTS) TARGET_OS = $(shell $(CC) -dumpmachine) -ifeq ($(TARGET_OS),mingw32) +ifeq ($(OS),Windows_NT) INCLUDEDIR=$(INCLUDEDIR_WIN32) ADDITIONALLIBS=$(ADDITIONALLIBS_WIN32) else ifeq ($(TARGET_OS),cygwin) @@ -47,7 +47,7 @@ endif ############ # Recipies # ############ -ifeq ($(TARGET_OS),mingw32) +ifeq ($(OS),Windows_NT) all: win32 else all: unix @@ -59,7 +59,7 @@ obj/%.o: %.cpp @echo $(CC) "$^ -> $@" @$(CC) $(CFLAGS) $(INCLUDEDIR) -o $@ -c $< -ifeq ($(TARGET_OS),mingw32) +ifeq ($(OS),Windows_NT) clean: clean_win32 else clean: clean_unix @@ -74,7 +74,8 @@ win32: bin/lib$(PLUGIN_NAME).dll bin/lib$(PLUGIN_NAME).dll: $(OBJECTS) @echo $(CC) "$@" - @$(CC) -shared $(CFLAGS) -o $@ $^ ../libcom_plugin.a $(ADDITIONALLIBS) + @echo here + @$(CC) -shared $(CFLAGS) -o $@ $^ -L.. -lcom_plugin $(ADDITIONALLIBS) clean_win32: @del $(subst /,\\,$(OBJECTS)) From 601b9dd67b5282656662f205ef5fef09f02c8b28 Mon Sep 17 00:00:00 2001 From: bloke Date: Mon, 10 Sep 2018 22:46:52 +0200 Subject: [PATCH 2/2] Plugin_Scr_AddArrayKey isn't exported on windows. was that a typo for Plugin_Scr_AddArrayKeys? --- MySQLPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MySQLPlugin.cpp b/MySQLPlugin.cpp index 5386ee1..ecbe133 100644 --- a/MySQLPlugin.cpp +++ b/MySQLPlugin.cpp @@ -377,7 +377,7 @@ void CMySQLPlugin::OnScript_Fetch_Row() else Plugin_Scr_AddString(row[i]); - Plugin_Scr_AddArrayKey(Plugin_Scr_AllocString(field->name)); + Plugin_Scr_AddArrayKeys(Plugin_Scr_AllocString(field->name)); } } } @@ -429,7 +429,7 @@ void CMySQLPlugin::OnScript_Fetch_Rows() for (unsigned int i = 0; i < col_count; ++i) { Plugin_Scr_AddString(rows[i]); - Plugin_Scr_AddArrayKey(keyArrayIndex[i]); + Plugin_Scr_AddArrayKeys(keyArrayIndex[i]); } Plugin_Scr_AddArray(); }