From e78c2fd6767c0713da44dacb6f28d3bb5295f20e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 17 May 2015 04:05:43 -0500 Subject: [PATCH] Extension framework changes --- ace_parse_imagepath.dll | Bin 79872 -> 80896 bytes addons/interact_menu/config.cpp | 2 +- extensions/parse_imagepath/CMakeLists.txt | 7 ++++--- .../parse_imagepath/ace_parse_imagepath.cpp | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ace_parse_imagepath.dll b/ace_parse_imagepath.dll index 22bf816f3bb990ca0a6a6cc053d1df94b1ea762b..33264959a89442ab3525565164ae539d80e3ef45 100644 GIT binary patch delta 13124 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 a!RRoS5R#2VzzA1eN5EN4r?rWqU;J-$N~5^| delta 12309 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 G(*GBMcab{) diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index c1da3392e9..8909c3d685 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -21,5 +21,5 @@ class CfgPatches { #include "ACE_Settings.hpp" class ACE_Extensions { - extensions[] += {"ace_break_line"}; + extensions[] += {"ace_break_line", "ace_parse_imagepath"}; }; diff --git a/extensions/parse_imagepath/CMakeLists.txt b/extensions/parse_imagepath/CMakeLists.txt index 67e0003752..e38a4bb506 100644 --- a/extensions/parse_imagepath/CMakeLists.txt +++ b/extensions/parse_imagepath/CMakeLists.txt @@ -1,9 +1,10 @@ set(ACE_EXTENSION_NAME "ace_parse_imagepath") file(GLOB SOURCES *.h *.hpp *.c *.cpp) -add_library( ${ACE_EXTENSION_NAME} SHARED ${GLOBAL_SOURCES} ${SOURCES}) -add_dependencies(${ACE_EXTENSION_NAME} ace_common) -SET_TARGET_PROPERTIES(${ACE_EXTENSION_NAME} PROPERTIES PREFIX "") +add_library( ${ACE_EXTENSION_NAME} SHARED ${SOURCES} ${GLOBAL_SOURCES}) +target_link_libraries(${ACE_EXTENSION_NAME} ace_common) +set_target_properties(${ACE_EXTENSION_NAME} PROPERTIES PREFIX "") +set_target_properties(${ACE_EXTENSION_NAME} PROPERTIES FOLDER Extensions) if(CMAKE_COMPILER_IS_GNUCXX) set_target_properties(${ACE_EXTENSION_NAME} PROPERTIES LINK_SEARCH_START_STATIC 1) diff --git a/extensions/parse_imagepath/ace_parse_imagepath.cpp b/extensions/parse_imagepath/ace_parse_imagepath.cpp index 86d41ca495..051535e473 100644 --- a/extensions/parse_imagepath/ace_parse_imagepath.cpp +++ b/extensions/parse_imagepath/ace_parse_imagepath.cpp @@ -11,7 +11,7 @@ * Just the image path or "" if none */ -#include "ace_common.h" +#include "shared.hpp" #include #include @@ -41,12 +41,14 @@ std::string getImagePathFromStructuredText(const std::string & input) { #pragma warning( disable : 4996 ) void __stdcall RVExtension(char *output, int outputSize, const char *function) { + ZERO_OUTPUT(); if (!strcmp(function, "version")) { strncpy(output, ACE_FULL_VERSION_STR, outputSize); } else { strncpy(output, getImagePathFromStructuredText(function).c_str(), outputSize); output[outputSize - 1] = '\0'; } + EXTENSION_RETURN(); } #pragma warning( pop )