summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-07-20 13:13:28 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-07-20 13:13:28 +0000
commit8593e7594773c30b35488bb6a45fcc782ed5df0c (patch)
tree7e1e7b44b5331b419c2843f155d0e04ba6e56635
parent1de47a8a191ae6c607972c51ae0289e474e9f52c (diff)
ModernOpt: changed folder structure
git-svn-id: http://svn.miranda-ng.org/main/trunk@1081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat
-rw-r--r--plugins/ModernOpt/Res/resource.rc (renamed from plugins/ModernOpt/resource.rc)18
-rw-r--r--plugins/ModernOpt/commonheaders.cpp2
-rw-r--r--plugins/ModernOpt/docs/modernopt-translation.txt (renamed from plugins/ModernOpt/modernopt-translation.txt)0
-rw-r--r--plugins/ModernOpt/modernopt_10.vcxproj35
-rw-r--r--plugins/ModernOpt/modernopt_10.vcxproj.filters45
-rw-r--r--plugins/ModernOpt/src/commonheaders.h (renamed from plugins/ModernOpt/commonheaders.h)0
-rw-r--r--plugins/ModernOpt/src/main.cpp (renamed from plugins/ModernOpt/main.cpp)1
-rw-r--r--plugins/ModernOpt/src/modernopt.cpp (renamed from plugins/ModernOpt/modernopt.cpp)2
-rw-r--r--plugins/ModernOpt/src/modernopt.h (renamed from plugins/ModernOpt/modernopt.h)0
-rw-r--r--plugins/ModernOpt/src/mopt_home.cpp (renamed from plugins/ModernOpt/mopt_home.cpp)0
-rw-r--r--plugins/ModernOpt/src/mopt_ignore.cpp (renamed from plugins/ModernOpt/mopt_ignore.cpp)0
-rw-r--r--plugins/ModernOpt/src/mopt_selector.cpp (renamed from plugins/ModernOpt/mopt_selector.cpp)0
-rw-r--r--plugins/ModernOpt/src/resource.h (renamed from plugins/ModernOpt/resource.h)0
13 files changed, 29 insertions, 74 deletions
diff --git a/plugins/ModernOpt/resource.rc b/plugins/ModernOpt/Res/resource.rc
index 44ee23cf2b..e3a99c754a 100644
--- a/plugins/ModernOpt/resource.rc
+++ b/plugins/ModernOpt/Res/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -86,14 +86,14 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_BIG_ADVANCED ICON "res/big_advanced.ico"
-IDI_BIG_BUDDYLIST ICON "res/big_buddylist.ico"
-IDI_BIG_IGNORE ICON "res/big_ignore.ico"
-IDI_BIG_MESSAGE ICON "res/big_message.ico"
-IDI_BIG_MODULES ICON "res/big_modules.ico"
-IDI_BIG_NETWORK ICON "res/big_network.ico"
-IDI_BIG_SKINS ICON "res/big_skins.ico"
-IDI_BIG_STATUS ICON "res/big_status.ico"
+IDI_BIG_ADVANCED ICON "big_advanced.ico"
+IDI_BIG_BUDDYLIST ICON "big_buddylist.ico"
+IDI_BIG_IGNORE ICON "big_ignore.ico"
+IDI_BIG_MESSAGE ICON "big_message.ico"
+IDI_BIG_MODULES ICON "big_modules.ico"
+IDI_BIG_NETWORK ICON "big_network.ico"
+IDI_BIG_SKINS ICON "big_skins.ico"
+IDI_BIG_STATUS ICON "big_status.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ModernOpt/commonheaders.cpp b/plugins/ModernOpt/commonheaders.cpp
deleted file mode 100644
index 95b2201163..0000000000
--- a/plugins/ModernOpt/commonheaders.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "commonheaders.h"
-
diff --git a/plugins/ModernOpt/modernopt-translation.txt b/plugins/ModernOpt/docs/modernopt-translation.txt
index 21848f53c0..21848f53c0 100644
--- a/plugins/ModernOpt/modernopt-translation.txt
+++ b/plugins/ModernOpt/docs/modernopt-translation.txt
diff --git a/plugins/ModernOpt/modernopt_10.vcxproj b/plugins/ModernOpt/modernopt_10.vcxproj
index e09c8b4d28..b8496c422a 100644
--- a/plugins/ModernOpt/modernopt_10.vcxproj
+++ b/plugins/ModernOpt/modernopt_10.vcxproj
@@ -73,7 +73,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;mebeam_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -98,7 +98,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;mebeam_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -111,7 +111,6 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
@@ -157,7 +156,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;mebeam_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -173,7 +172,6 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -184,31 +182,20 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="commonheaders.cpp">
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="main.cpp" />
- <ClCompile Include="modernopt.cpp" />
- <ClCompile Include="mopt_home.cpp" />
- <ClCompile Include="mopt_ignore.cpp" />
- <ClCompile Include="mopt_selector.cpp" />
+ <ClCompile Include="src\modernopt.cpp" />
+ <ClCompile Include="src\mopt_home.cpp" />
+ <ClCompile Include="src\mopt_ignore.cpp" />
+ <ClCompile Include="src\mopt_selector.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="modernopt.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\modernopt.h" />
</ItemGroup>
<ItemGroup>
- <None Include="Res\big_advanced.ico" />
- <None Include="Res\big_buddylist.ico" />
- <None Include="Res\big_ignore.ico" />
- <None Include="Res\big_message.ico" />
- <None Include="Res\big_modules.ico" />
- <None Include="Res\big_network.ico" />
- <None Include="Res\big_skins.ico" />
- <None Include="Res\big_status.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/ModernOpt/modernopt_10.vcxproj.filters b/plugins/ModernOpt/modernopt_10.vcxproj.filters
index 86a8c7efcc..c911c441d5 100644
--- a/plugins/ModernOpt/modernopt_10.vcxproj.filters
+++ b/plugins/ModernOpt/modernopt_10.vcxproj.filters
@@ -15,61 +15,32 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="commonheaders.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\modernopt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="modernopt.cpp">
+ <ClCompile Include="src\mopt_home.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mopt_home.cpp">
+ <ClCompile Include="src\mopt_ignore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mopt_ignore.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="mopt_selector.cpp">
+ <ClCompile Include="src\mopt_selector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="modernopt.h">
+ <ClInclude Include="src\modernopt.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="Res\big_advanced.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_buddylist.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_ignore.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_message.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_modules.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_network.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_skins.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Res\big_status.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/ModernOpt/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h
index 2d133a802e..2d133a802e 100644
--- a/plugins/ModernOpt/commonheaders.h
+++ b/plugins/ModernOpt/src/commonheaders.h
diff --git a/plugins/ModernOpt/main.cpp b/plugins/ModernOpt/src/main.cpp
index 303f69f032..c11f8349f9 100644
--- a/plugins/ModernOpt/main.cpp
+++ b/plugins/ModernOpt/src/main.cpp
@@ -1,4 +1,3 @@
-
#include "commonheaders.h"
diff --git a/plugins/ModernOpt/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index a06db2040c..1345631268 100644
--- a/plugins/ModernOpt/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "commonheaders.h"
#include "modernopt.h"
-#include "../../src/resource.h"
+#include "../../../src/resource.h"
//#define MOPT_SAMPLE_PAGES
diff --git a/plugins/ModernOpt/modernopt.h b/plugins/ModernOpt/src/modernopt.h
index 728488d810..728488d810 100644
--- a/plugins/ModernOpt/modernopt.h
+++ b/plugins/ModernOpt/src/modernopt.h
diff --git a/plugins/ModernOpt/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp
index 980f580121..980f580121 100644
--- a/plugins/ModernOpt/mopt_home.cpp
+++ b/plugins/ModernOpt/src/mopt_home.cpp
diff --git a/plugins/ModernOpt/mopt_ignore.cpp b/plugins/ModernOpt/src/mopt_ignore.cpp
index 74f8b1524d..74f8b1524d 100644
--- a/plugins/ModernOpt/mopt_ignore.cpp
+++ b/plugins/ModernOpt/src/mopt_ignore.cpp
diff --git a/plugins/ModernOpt/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp
index 42b15f51bb..42b15f51bb 100644
--- a/plugins/ModernOpt/mopt_selector.cpp
+++ b/plugins/ModernOpt/src/mopt_selector.cpp
diff --git a/plugins/ModernOpt/resource.h b/plugins/ModernOpt/src/resource.h
index de4fbab2e0..de4fbab2e0 100644
--- a/plugins/ModernOpt/resource.h
+++ b/plugins/ModernOpt/src/resource.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 09:51:25 +0000