Compare commits

..

No commits in common. "main" and "ProposedCleanup" have entirely different histories.

4 changed files with 35 additions and 73 deletions

View File

@ -11,48 +11,31 @@ joomer-efsw-file-monitoring
- drag and drop files into the test folder - drag and drop files into the test folder
``` ```
[todo]
# Build # Build
``` ```
learndir/ learndir/
└── joomer-efsw-file-monitoring/ └── joomer-efsw-file-monitoring/
└──x64
└──release
└──test
└──Linux
└──release
└──test
└── efsw └── efsw
``` ```
## Ubuntu Linux ## Ubuntu Linux
Run terminal
``` ```
# Install the following if not already installed mkdir learndir
sudo apt update cd learndir
sudo apt install git git clone https://github.com/SpartanJ/efsw.git
sudo apt install cmake mkdir -p efsw/build
sudo apt install build-essential cmake # build-essential contains gcc,g++ and make cd efsw/build
# create all the directories needed
mkdir learndir && cd learndir
mkdir efsw joomer-efsw-file-monitoring
# Build Entropia File System Watcher
cd efsw
git clone https://github.com/SpartanJ/efsw.git .
mkdir -p build
cd build
cmake .. cmake ..
make -j$(nproc) make -j4
cd ../..
# Build joomer-efsw-file-monitoring git clone https://git.indoodle.com/jason/joomer-efsw-file-monitoring.git
cd ../../joomer-efsw-file-monitoring cd joomer-efsw-file-monitoring
git clone https://git.indoodle.com/jason/joomer-efsw-file-monitoring.git . git switch ProposedCleanup
wget https://raw.githubusercontent.com/nothings/stb/master/stb_image.h wget https://raw.githubusercontent.com/nothings/stb/master/stb_image.h
wget https://raw.githubusercontent.com/nothings/stb/master/stb_image_write.h wget https://raw.githubusercontent.com/nothings/stb/master/stb_image_write.h
make all -j$(nproc) make all -j4
mkdir bin/Linux/release/test mkdir bin/Linux/release/test
bin/Linux/release/joomer-efsw-file-monitoring bin/Linux/release/joomer-efsw-file-monitoring
``` ```
@ -65,26 +48,23 @@ bin/Linux/release/joomer-efsw-file-monitoring
Run **x64 Native Tools Command Prompt for VS** Run **x64 Native Tools Command Prompt for VS**
``` ```
mkdir learndir && cd learndir mkdir learndir
mkdir efsw joomer-efsw-file-monitoring cd learndir
git clone https://github.com/SpartanJ/efsw.git
# Build Entropia File System Watcher
cd efsw cd efsw
git clone https://github.com/SpartanJ/efsw.git . mkdir build
cmake -B ./build cd build
cmake --build ./build --config Release -j%NUMBER_OF_PROCESSORS% cmake ..
msbuild efsw.sln /p:Configuration=Release /p:Platform=x64
# Build joomer-efsw-file-monitoring cd ..
cd ../joomer-efsw-file-monitoring git clone https://git.indoodle.com/jason/joomer-efsw-file-monitoring.git
git clone https://git.indoodle.com/jason/joomer-efsw-file-monitoring.git . cd joomer-efsw-file-monitoring
git switch ProposedCleanup
curl -LO https://raw.githubusercontent.com/nothings/stb/master/stb_image.h curl -LO https://raw.githubusercontent.com/nothings/stb/master/stb_image.h
curl -LO https://raw.githubusercontent.com/nothings/stb/master/stb_image_write.h curl -LO https://raw.githubusercontent.com/nothings/stb/master/stb_image_write.h
msbuild joomer-efsw-file-monitoring.vcxproj /p:Configuration=release msbuild joomer-efsw-file-monitoring.vcxproj /p:Configuration=release /p:Platform=x64 /p:PlatformToolset=v145
mkdir -p x64\release\test
# create test folder to put images in
mkdir x64\release\test
# run
x64\release\joomer-efsw-file-monitoring.exe x64\release\joomer-efsw-file-monitoring.exe
``` ```

View File

@ -1,16 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="PseudoDebug|x64">
<Configuration>Debug</Configuration> <Configuration>PseudoDebug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Release|x64">
@ -21,18 +13,10 @@
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion> <VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>joomer_efsw_file_monitoring</RootNamespace>
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)obj\**</DefaultItemExcludes>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectGuid>{7AEA0690-36B7-4596-9DEE-C3AB3C11D282}</ProjectGuid> <ProjectGuid>{7AEA0690-36B7-4596-9DEE-C3AB3C11D282}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PseudoDebug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
@ -41,26 +25,24 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Label="Shared"> <ImportGroup Label="Shared">
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='PseudoDebug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PseudoDebug|x64'">
<ClCompile> <ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<SDLCheck>false</SDLCheck> <SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>DEBUG;_CONSOLE;DL_USE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>PSEUDODEBUG;_CONSOLE;DL_USE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\efsw\include;..\efsw\src</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\efsw\include;..\efsw\src</AdditionalIncludeDirectories>
@ -68,7 +50,7 @@
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>lib;..\efsw\build\$(Configuration)\$(Platform)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>lib;..\efsw\build\Debug</AdditionalLibraryDirectories>
<AdditionalDependencies>efsw-static.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>efsw-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>