diff --git a/Tutorial/Console_Workflow/W05_Compile/Main.cpp b/Tutorial/Console_Workflow/W05_Compile/Main.cpp index fd42ebaa..f08ee042 100644 --- a/Tutorial/Console_Workflow/W05_Compile/Main.cpp +++ b/Tutorial/Console_Workflow/W05_Compile/Main.cpp @@ -71,12 +71,13 @@ int wmain(int argc, const wchar_t* argv[]) // the loop exist because x64 binaries are stored in ../x64/Debug instead of ../Debug cppFolder = cppFolder.GetFolder(); } - cppFolder = cppFolder / L"W05_DynamicRun" / L"Generated"; + cppFolder = cppFolder / L"W05_StaticRun" / L"Generated"; auto cppInput = MakePtr(L"W05Script"); cppInput->comment = L"THIS FILE IS GENERATED BY W05_COMPILE"; cppInput->headerGuardPrefix = L"W05_SCRIPT_"; cppInput->normalIncludes.Add(L"../../W05_Lib/W05_Lib.h"); + cppInput->normalIncludes.Add(L"VlppWorkflowLibrary.h"); auto cppOutput = GenerateCppFiles(cppInput, &manager); for (vint i = 0; i < cppOutput->cppFiles.Count(); i++) diff --git a/Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05Script.cpp b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.cpp similarity index 100% rename from Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05Script.cpp rename to Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.cpp diff --git a/Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05Script.h b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h similarity index 98% rename from Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05Script.h rename to Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h index 71d52360..b91c4233 100644 --- a/Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05Script.h +++ b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05Script.h @@ -11,6 +11,7 @@ https://github.com/vczh-libraries #define W05_SCRIPT_W05SCRIPT #include "../../W05_Lib/W05_Lib.h" +#include "VlppWorkflowLibrary.h" #if defined( _MSC_VER) #pragma warning(push) diff --git a/Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05ScriptIncludes.h b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptIncludes.h similarity index 100% rename from Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05ScriptIncludes.h rename to Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptIncludes.h diff --git a/Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05ScriptReflection.cpp b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.cpp similarity index 100% rename from Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05ScriptReflection.cpp rename to Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.cpp diff --git a/Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05ScriptReflection.h b/Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.h similarity index 100% rename from Tutorial/Console_Workflow/W05_DynamicRun/Generated/W05ScriptReflection.h rename to Tutorial/Console_Workflow/W05_StaticRun/Generated/W05ScriptReflection.h diff --git a/Tutorial/Console_Workflow/W05_StaticRun/Main.cpp b/Tutorial/Console_Workflow/W05_StaticRun/Main.cpp new file mode 100644 index 00000000..1b7b92a3 --- /dev/null +++ b/Tutorial/Console_Workflow/W05_StaticRun/Main.cpp @@ -0,0 +1,14 @@ +#include "Generated/W05ScriptIncludes.h" + +using namespace myscript; + +int main() +{ + // VCZH_DEBUG_NO_REFLECTION is on + // so we don't need, and are not allowed, to start reflection + auto myapp = MakePtr(); + myapp->CreateScripting()->Execute(L"Gaclib"); + + // we need to call this because we use generated code from Workflow script + FinalizeGlobalStorage(); +} \ No newline at end of file diff --git a/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj b/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj index f75e7ac7..9aa64a21 100644 --- a/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj +++ b/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj @@ -152,9 +152,9 @@ - - + + @@ -187,8 +187,9 @@ /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) - + + diff --git a/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj.filters b/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj.filters index 84f4c28b..199b9172 100644 --- a/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj.filters +++ b/Tutorial/Console_Workflow/W05_StaticRun/W05_StaticRun.vcxproj.filters @@ -39,10 +39,10 @@ Source Files - + Generated - + Generated @@ -65,7 +65,10 @@ Source Files - + + Source Files + + Generated