Move include-folder into lib-folder

EvenAR · Dec 16, 2020 · bdf055b · bdf055b
1 parent a5f2684
commit bdf055b
Show file tree

Hide file tree

Showing 41 changed files with 4 additions and 4 deletions.
diff --git a/Aman/Aman.vcxproj b/Aman/Aman.vcxproj
@@ -92,7 +92,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib\include</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
@@ -139,7 +139,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib\include</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>

diff --git a/Aman/AmanPlugIn.cpp b/Aman/AmanPlugIn.cpp
@@ -36,7 +36,7 @@ AmanPlugIn::AmanPlugIn() : CPlugIn(COMPATIBILITY_CODE, "Arrival Manager", "1.4.0
     std::string fullPluginPathStr(fullPluginPath);
     pluginDirectory = fullPluginPathStr.substr(0, fullPluginPathStr.find_last_of("\\"));
 
-    loadTimelines("aman_profiles.json");
+    loadTimelines("aman-config.json");
 
     amanController = std::make_shared<AmanController>(this);
     amanController->modelLoaded();

diff --git a/Aman/AmanWindow.cpp b/Aman/AmanWindow.cpp
@@ -22,7 +22,7 @@ AmanWindow::AmanWindow(AmanController* controller, std::set<std::string> availPr
     };
 
     std::vector<std::string> profileOptions(availProfiles.begin(), availProfiles.end());
-    this->profilesMenu = std::make_shared<PopupMenu>("Load", profileOptions, onSelection);
+    this->profilesMenu = std::make_shared<PopupMenu>("Profiles", profileOptions, onSelection);
     this->menuBar->addPopupMenu(profilesMenu);
 
     this->titleBar->on("COLLAPSE_CLICKED", [&]() {

diff --git a/include/EuroScopePlugIn.h → lib/include/EuroScopePlugIn.h b/include/EuroScopePlugIn.h → lib/include/EuroScopePlugIn.h
diff --git a/include/rapidjson/allocators.h → lib/include/rapidjson/allocators.h b/include/rapidjson/allocators.h → lib/include/rapidjson/allocators.h
diff --git a/include/rapidjson/cursorstreamwrapper.h → lib/include/rapidjson/cursorstreamwrapper.h b/include/rapidjson/cursorstreamwrapper.h → lib/include/rapidjson/cursorstreamwrapper.h
diff --git a/include/rapidjson/document.h → lib/include/rapidjson/document.h b/include/rapidjson/document.h → lib/include/rapidjson/document.h
diff --git a/include/rapidjson/encodedstream.h → lib/include/rapidjson/encodedstream.h b/include/rapidjson/encodedstream.h → lib/include/rapidjson/encodedstream.h
diff --git a/include/rapidjson/encodings.h → lib/include/rapidjson/encodings.h b/include/rapidjson/encodings.h → lib/include/rapidjson/encodings.h
diff --git a/include/rapidjson/error/en.h → lib/include/rapidjson/error/en.h b/include/rapidjson/error/en.h → lib/include/rapidjson/error/en.h
diff --git a/include/rapidjson/error/error.h → lib/include/rapidjson/error/error.h b/include/rapidjson/error/error.h → lib/include/rapidjson/error/error.h
diff --git a/include/rapidjson/filereadstream.h → lib/include/rapidjson/filereadstream.h b/include/rapidjson/filereadstream.h → lib/include/rapidjson/filereadstream.h
diff --git a/include/rapidjson/filewritestream.h → lib/include/rapidjson/filewritestream.h b/include/rapidjson/filewritestream.h → lib/include/rapidjson/filewritestream.h
diff --git a/include/rapidjson/fwd.h → lib/include/rapidjson/fwd.h b/include/rapidjson/fwd.h → lib/include/rapidjson/fwd.h
diff --git a/include/rapidjson/internal/biginteger.h → lib/include/rapidjson/internal/biginteger.h b/include/rapidjson/internal/biginteger.h → lib/include/rapidjson/internal/biginteger.h
diff --git a/include/rapidjson/internal/clzll.h → lib/include/rapidjson/internal/clzll.h b/include/rapidjson/internal/clzll.h → lib/include/rapidjson/internal/clzll.h
diff --git a/include/rapidjson/internal/diyfp.h → lib/include/rapidjson/internal/diyfp.h b/include/rapidjson/internal/diyfp.h → lib/include/rapidjson/internal/diyfp.h
diff --git a/include/rapidjson/internal/dtoa.h → lib/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h → lib/include/rapidjson/internal/dtoa.h
diff --git a/include/rapidjson/internal/ieee754.h → lib/include/rapidjson/internal/ieee754.h b/include/rapidjson/internal/ieee754.h → lib/include/rapidjson/internal/ieee754.h
diff --git a/include/rapidjson/internal/itoa.h → lib/include/rapidjson/internal/itoa.h b/include/rapidjson/internal/itoa.h → lib/include/rapidjson/internal/itoa.h
diff --git a/include/rapidjson/internal/meta.h → lib/include/rapidjson/internal/meta.h b/include/rapidjson/internal/meta.h → lib/include/rapidjson/internal/meta.h
diff --git a/include/rapidjson/internal/pow10.h → lib/include/rapidjson/internal/pow10.h b/include/rapidjson/internal/pow10.h → lib/include/rapidjson/internal/pow10.h
diff --git a/include/rapidjson/internal/regex.h → lib/include/rapidjson/internal/regex.h b/include/rapidjson/internal/regex.h → lib/include/rapidjson/internal/regex.h
diff --git a/include/rapidjson/internal/stack.h → lib/include/rapidjson/internal/stack.h b/include/rapidjson/internal/stack.h → lib/include/rapidjson/internal/stack.h
diff --git a/include/rapidjson/internal/strfunc.h → lib/include/rapidjson/internal/strfunc.h b/include/rapidjson/internal/strfunc.h → lib/include/rapidjson/internal/strfunc.h
diff --git a/include/rapidjson/internal/strtod.h → lib/include/rapidjson/internal/strtod.h b/include/rapidjson/internal/strtod.h → lib/include/rapidjson/internal/strtod.h
diff --git a/include/rapidjson/internal/swap.h → lib/include/rapidjson/internal/swap.h b/include/rapidjson/internal/swap.h → lib/include/rapidjson/internal/swap.h
diff --git a/include/rapidjson/istreamwrapper.h → lib/include/rapidjson/istreamwrapper.h b/include/rapidjson/istreamwrapper.h → lib/include/rapidjson/istreamwrapper.h
diff --git a/include/rapidjson/memorybuffer.h → lib/include/rapidjson/memorybuffer.h b/include/rapidjson/memorybuffer.h → lib/include/rapidjson/memorybuffer.h
diff --git a/include/rapidjson/memorystream.h → lib/include/rapidjson/memorystream.h b/include/rapidjson/memorystream.h → lib/include/rapidjson/memorystream.h
diff --git a/include/rapidjson/msinttypes/inttypes.h → lib/include/rapidjson/msinttypes/inttypes.h b/include/rapidjson/msinttypes/inttypes.h → lib/include/rapidjson/msinttypes/inttypes.h
diff --git a/include/rapidjson/msinttypes/stdint.h → lib/include/rapidjson/msinttypes/stdint.h b/include/rapidjson/msinttypes/stdint.h → lib/include/rapidjson/msinttypes/stdint.h
diff --git a/include/rapidjson/ostreamwrapper.h → lib/include/rapidjson/ostreamwrapper.h b/include/rapidjson/ostreamwrapper.h → lib/include/rapidjson/ostreamwrapper.h
diff --git a/include/rapidjson/pointer.h → lib/include/rapidjson/pointer.h b/include/rapidjson/pointer.h → lib/include/rapidjson/pointer.h
diff --git a/include/rapidjson/prettywriter.h → lib/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h → lib/include/rapidjson/prettywriter.h
diff --git a/include/rapidjson/rapidjson.h → lib/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h → lib/include/rapidjson/rapidjson.h
diff --git a/include/rapidjson/reader.h → lib/include/rapidjson/reader.h b/include/rapidjson/reader.h → lib/include/rapidjson/reader.h
diff --git a/include/rapidjson/schema.h → lib/include/rapidjson/schema.h b/include/rapidjson/schema.h → lib/include/rapidjson/schema.h
diff --git a/include/rapidjson/stream.h → lib/include/rapidjson/stream.h b/include/rapidjson/stream.h → lib/include/rapidjson/stream.h
diff --git a/include/rapidjson/stringbuffer.h → lib/include/rapidjson/stringbuffer.h b/include/rapidjson/stringbuffer.h → lib/include/rapidjson/stringbuffer.h
diff --git a/include/rapidjson/writer.h → lib/include/rapidjson/writer.h b/include/rapidjson/writer.h → lib/include/rapidjson/writer.h