From 59685f53e7e220033545ccb9a4a91b45ead53e3b Mon Sep 17 00:00:00 2001
From: Nou <cliff.foster@idi-systems.com>
Date: Sun, 11 Jan 2015 16:04:14 -0800
Subject: [PATCH] Changed PREP macro to use CBA function caching and our folder
 structure, removed PREPF macro to follow normal PREP CBA standard. Changed
 examples to match (also changed a few caps in paths, and the required addons
 to match ACE).

---
 addons/main/script_macros.hpp            | 11 +++++++++--
 extras/blank_module/XEH_preInit.sqf      |  2 +-
 extras/blank_module/config.cpp           |  2 +-
 extras/blank_module/script_component.hpp |  4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
index 525aa34a2c..3dd2b1ba92 100644
--- a/addons/main/script_macros.hpp
+++ b/addons/main/script_macros.hpp
@@ -170,8 +170,6 @@
 #define ACE_TEXT_YELLOW(Text) ("<t color='#FFFF00'>" + ##Text + "</t>")
 
 
-#define PREPF(fncName) FUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf))
-#define PREP_MODULE(folder) [] call compile preprocessFileLineNumbers QUOTE(PATHTOF(folder\__PREP__.sqf))
 
 #define EGVAR(module,var) TRIPLES(PREFIX,module,var)
 #define QEGVAR(module,var) QUOTE(EGVAR(module,var))
@@ -180,6 +178,15 @@
 #define DVAR(varName) 	if(isNil "ACE_DEBUG_NAMESPACE") then { ACE_DEBUG_NAMESPACE = []; }; if(!(QUOTE(varName) in ACE_DEBUG_NAMESPACE)) then { PUSH(ACE_DEBUG_NAMESPACE, QUOTE(varName)); }; varName
 #define DFUNC(var1) TRIPLES(ADDON,fnc,var1)
 
+#ifdef DISABLE_COMPILE_CACHE
+	#define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf))
+#else
+	#define PREP(fncName) DFUNC(fncName) = QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf)) call SLX_XEH_COMPILE
+#endif
+
+#define PREP_MODULE(folder) [] call compile preprocessFileLineNumbers QUOTE(PATHTOF(folder\__PREP__.sqf))
+
+
 #ifdef ENABLE_CALLSTACK
 #define CALLSTACK(function) {private ['_ret']; if(ACE_IS_ERRORED) then { ['AUTO','AUTO'] call ACE_DUMPSTACK_FNC; ACE_IS_ERRORED = false; }; ACE_IS_ERRORED = true; ACE_STACK_TRACE set [ACE_STACK_DEPTH, [diag_tickTime, __FILE__, __LINE__, ACE_CURRENT_FUNCTION, 'ANON', _this]]; ACE_STACK_DEPTH = ACE_STACK_DEPTH + 1; ACE_CURRENT_FUNCTION = 'ANON'; _ret = _this call ##function; ACE_STACK_DEPTH = ACE_STACK_DEPTH - 1; ACE_IS_ERRORED = false; _ret;}
 #define CALLSTACK_NAMED(function, functionName) {private ['_ret']; if(ACE_IS_ERRORED) then { ['AUTO','AUTO'] call ACE_DUMPSTACK_FNC; ACE_IS_ERRORED = false; }; ACE_IS_ERRORED = true; ACE_STACK_TRACE set [ACE_STACK_DEPTH, [diag_tickTime, __FILE__, __LINE__, ACE_CURRENT_FUNCTION, functionName, _this]]; ACE_STACK_DEPTH = ACE_STACK_DEPTH + 1; ACE_CURRENT_FUNCTION = functionName; _ret = _this call ##function; ACE_STACK_DEPTH = ACE_STACK_DEPTH - 1; ACE_IS_ERRORED = false; _ret;}
diff --git a/extras/blank_module/XEH_preInit.sqf b/extras/blank_module/XEH_preInit.sqf
index a8321ce3d5..a515eb4187 100644
--- a/extras/blank_module/XEH_preInit.sqf
+++ b/extras/blank_module/XEH_preInit.sqf
@@ -1,3 +1,3 @@
 #include "script_component.hpp"
 
-PREPF(empty);
\ No newline at end of file
+PREP(empty);
\ No newline at end of file
diff --git a/extras/blank_module/config.cpp b/extras/blank_module/config.cpp
index 56fa6a3b32..628865c703 100644
--- a/extras/blank_module/config.cpp
+++ b/extras/blank_module/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
     units[] = {};
     weapons[] = {};
     requiredVersion = 0.60;
-    requiredAddons[] = {"AGM_Core", "AGM_Interaction"};
+    requiredAddons[] = {"ace_core"};
     version = "0.95";
     versionStr = "0.95";
     versionAr[] = {0,95,0};
diff --git a/extras/blank_module/script_component.hpp b/extras/blank_module/script_component.hpp
index 1b99905148..40058509c2 100644
--- a/extras/blank_module/script_component.hpp
+++ b/extras/blank_module/script_component.hpp
@@ -1,5 +1,5 @@
 #define COMPONENT blank
-#include "\z\ace\Addons\main\script_mod.hpp"
+#include "\z\ace\addons\main\script_mod.hpp"
 
 #ifdef DEBUG_ENABLED_BLANK
 	#define DEBUG_MODE_FULL
@@ -9,4 +9,4 @@
 	#define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK
 #endif
 
-#include "\z\ace\Addons\main\script_macros.hpp"
\ No newline at end of file
+#include "\z\ace\addons\main\script_macros.hpp"
\ No newline at end of file