diff options
-rw-r--r-- | plugins/LangMan/docs/Info_Src.txt (renamed from plugins/LangMan/Info_Src.txt) | 0 | ||||
-rw-r--r-- | plugins/LangMan/docs/License_Appendix.txt (renamed from plugins/LangMan/License_Appendix.txt) | 0 | ||||
-rw-r--r-- | plugins/LangMan/docs/langman-translation.txt (renamed from plugins/LangMan/langman-translation.txt) | 0 | ||||
-rw-r--r-- | plugins/LangMan/langman.vcxproj | 39 | ||||
-rw-r--r-- | plugins/LangMan/langman.vcxproj.filters | 45 | ||||
-rw-r--r-- | plugins/LangMan/langman.vcxproj.user | 3 | ||||
-rw-r--r-- | plugins/LangMan/res/resource.rc (renamed from plugins/LangMan/resource.rc) | 15 | ||||
-rw-r--r-- | plugins/LangMan/res/version.rc (renamed from plugins/LangMan/version.rc) | 11 | ||||
-rw-r--r-- | plugins/LangMan/src/common.h (renamed from plugins/LangMan/common.h) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/langpack.cpp (renamed from plugins/LangMan/langpack.cpp) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/langpack.h (renamed from plugins/LangMan/langpack.h) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/main.cpp (renamed from plugins/LangMan/main.cpp) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/options.cpp (renamed from plugins/LangMan/options.cpp) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/options.h (renamed from plugins/LangMan/options.h) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/resource.h (renamed from plugins/LangMan/resource.h) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/utils.cpp (renamed from plugins/LangMan/utils.cpp) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/utils.h (renamed from plugins/LangMan/utils.h) | 0 | ||||
-rw-r--r-- | plugins/LangMan/src/version.h (renamed from plugins/LangMan/version.h) | 0 |
18 files changed, 42 insertions, 71 deletions
diff --git a/plugins/LangMan/Info_Src.txt b/plugins/LangMan/docs/Info_Src.txt index af92c5afb8..af92c5afb8 100644 --- a/plugins/LangMan/Info_Src.txt +++ b/plugins/LangMan/docs/Info_Src.txt diff --git a/plugins/LangMan/License_Appendix.txt b/plugins/LangMan/docs/License_Appendix.txt index 9ad641dfa0..9ad641dfa0 100644 --- a/plugins/LangMan/License_Appendix.txt +++ b/plugins/LangMan/docs/License_Appendix.txt diff --git a/plugins/LangMan/langman-translation.txt b/plugins/LangMan/docs/langman-translation.txt index aa87fb8a05..aa87fb8a05 100644 --- a/plugins/LangMan/langman-translation.txt +++ b/plugins/LangMan/docs/langman-translation.txt diff --git a/plugins/LangMan/langman.vcxproj b/plugins/LangMan/langman.vcxproj index bc2b9a30e2..5b517d5207 100644 --- a/plugins/LangMan/langman.vcxproj +++ b/plugins/LangMan/langman.vcxproj @@ -73,7 +73,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -100,7 +100,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;UNICODE;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -127,7 +127,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -160,7 +160,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;UNICODE;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -187,31 +187,24 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="langpack.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\langpack.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="options.cpp" />
- <ClCompile Include="utils.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\utils.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="common.h" />
- <ClInclude Include="langpack.h" />
- <ClInclude Include="options.h" />
- <ClInclude Include="utils.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\common.h" />
+ <ClInclude Include="src\langpack.h" />
+ <ClInclude Include="src\options.h" />
+ <ClInclude Include="src\utils.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="docs\LangMan-Developer.txt" />
- <None Include="docs\LangMan-License.txt" />
- <None Include="docs\LangMan-Readme.txt" />
- <None Include="docs\LangMan-Translation.txt" />
- <None Include="Info_Src.txt" />
- <None Include="License_Appendix.txt" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/LangMan/langman.vcxproj.filters b/plugins/LangMan/langman.vcxproj.filters index 6231797375..55ef3aee7a 100644 --- a/plugins/LangMan/langman.vcxproj.filters +++ b/plugins/LangMan/langman.vcxproj.filters @@ -13,64 +13,47 @@ <UniqueIdentifier>{835877bf-050d-4034-b3fb-78e456d60765}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Documentation">
- <UniqueIdentifier>{b84ecfeb-8124-4339-b93d-5acdd3d205d9}</UniqueIdentifier>
- <Extensions>*.txt</Extensions>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="langpack.c">
+ <ClCompile Include="src\langpack.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.c">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.c">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.c">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="common.h">
+ <ClInclude Include="src\common.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="langpack.h">
+ <ClInclude Include="src\langpack.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="options.h">
+ <ClInclude Include="src\options.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="utils.h">
+ <ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Resource Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="docs\LangMan-Developer.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\LangMan-License.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\LangMan-Readme.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\LangMan-Translation.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="Info_Src.txt" />
- <None Include="License_Appendix.txt" />
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/LangMan/langman.vcxproj.user b/plugins/LangMan/langman.vcxproj.user new file mode 100644 index 0000000000..695b5c78b9 --- /dev/null +++ b/plugins/LangMan/langman.vcxproj.user @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file diff --git a/plugins/LangMan/resource.rc b/plugins/LangMan/res/resource.rc index 5ef5f248a4..ca7cf7f5bf 100644 --- a/plugins/LangMan/resource.rc +++ b/plugins/LangMan/res/resource.rc @@ -1,6 +1,6 @@ //Microsoft Developer Studio generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -27,20 +27,20 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // TEXTINCLUDE
//
-1 TEXTINCLUDE MOVEABLE PURE
+1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
-2 TEXTINCLUDE MOVEABLE PURE
+2 TEXTINCLUDE
BEGIN
"#include <winres.h>\r\n"
"\0"
END
-3 TEXTINCLUDE MOVEABLE PURE
+3 TEXTINCLUDE
BEGIN
- "#include ""version.rc""\r\n"
+ "\r\n"
"\0"
END
@@ -51,7 +51,7 @@ END // Icon
//
-IDI_RELOAD ICON "res\\reload.ico"
+IDI_RELOAD ICON "reload.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -195,7 +195,6 @@ END //
// Generated from the TEXTINCLUDE 3 resource.
//
-#include "version.rc"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
diff --git a/plugins/LangMan/version.rc b/plugins/LangMan/res/version.rc index 66b2e00a1f..74515a2847 100644 --- a/plugins/LangMan/version.rc +++ b/plugins/LangMan/res/version.rc @@ -2,9 +2,8 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#ifndef _MAC
-
-#include "version.h"
+#include "..\src\version.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
//
@@ -47,9 +46,3 @@ BEGIN VALUE "Translation", 0x0, 1200
END
END
-
-#endif // !_MAC
-
-
-
-
diff --git a/plugins/LangMan/common.h b/plugins/LangMan/src/common.h index 4ac9deb5b5..4ac9deb5b5 100644 --- a/plugins/LangMan/common.h +++ b/plugins/LangMan/src/common.h diff --git a/plugins/LangMan/langpack.cpp b/plugins/LangMan/src/langpack.cpp index 0f783e0bbe..0f783e0bbe 100644 --- a/plugins/LangMan/langpack.cpp +++ b/plugins/LangMan/src/langpack.cpp diff --git a/plugins/LangMan/langpack.h b/plugins/LangMan/src/langpack.h index 354286b405..354286b405 100644 --- a/plugins/LangMan/langpack.h +++ b/plugins/LangMan/src/langpack.h diff --git a/plugins/LangMan/main.cpp b/plugins/LangMan/src/main.cpp index 2309bf1ec8..2309bf1ec8 100644 --- a/plugins/LangMan/main.cpp +++ b/plugins/LangMan/src/main.cpp diff --git a/plugins/LangMan/options.cpp b/plugins/LangMan/src/options.cpp index 72f78dd597..72f78dd597 100644 --- a/plugins/LangMan/options.cpp +++ b/plugins/LangMan/src/options.cpp diff --git a/plugins/LangMan/options.h b/plugins/LangMan/src/options.h index 2b9e93b334..2b9e93b334 100644 --- a/plugins/LangMan/options.h +++ b/plugins/LangMan/src/options.h diff --git a/plugins/LangMan/resource.h b/plugins/LangMan/src/resource.h index 983f304ffb..983f304ffb 100644 --- a/plugins/LangMan/resource.h +++ b/plugins/LangMan/src/resource.h diff --git a/plugins/LangMan/utils.cpp b/plugins/LangMan/src/utils.cpp index c67b9813a8..c67b9813a8 100644 --- a/plugins/LangMan/utils.cpp +++ b/plugins/LangMan/src/utils.cpp diff --git a/plugins/LangMan/utils.h b/plugins/LangMan/src/utils.h index 8c4e299ebb..8c4e299ebb 100644 --- a/plugins/LangMan/utils.h +++ b/plugins/LangMan/src/utils.h diff --git a/plugins/LangMan/version.h b/plugins/LangMan/src/version.h index 69dae65ae4..69dae65ae4 100644 --- a/plugins/LangMan/version.h +++ b/plugins/LangMan/src/version.h |