mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-31 19:51:44 +02:00
Code Issues Projects Releases Wiki Activity

Fixed double right-click issue

Browse Source
This commit is contained in:
mathusummut
2018-09-26 22:10:22 +02:00
parent 04cb018d10
commit 5d250fb60b
30 changed files with 133 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/windows/g3d_viewer.rc
View File

@@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "..\shared\g3dviewer.ico"
IDI_ICON1 ICON DISCARDABLE "..\shared\g3d_viewer.ico"

1
mk/windows/glest_editor.rc
View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "..\shared\editor.ico"

8
mk/windows/group-binaries.bat
View File

@@ -18,8 +18,8 @@ copy /y ..\shared\glestkeys.ini bin\vs2017\glestkeys.ini
copy /y ..\shared\servers.ini bin\vs2015\servers.ini
copy /y ..\shared\servers.ini bin\vs2017\servers.ini
copy /y vs2015-32\g3dviewerWin32\Release\g3dviewer.exe bin\vs2015\g3dviewer-32.exe
copy /y vs2017-32\g3dviewerWin32\Release\g3dviewer.exe bin\vs2017\g3dviewer-32.exe
copy /y vs2015-32\g3d_viewerWin32\Release\g3d_viewer.exe bin\vs2015\g3d_viewer-32.exe
copy /y vs2017-32\g3d_viewerWin32\Release\g3d_viewer.exe bin\vs2017\g3d_viewer-32.exe
copy /y vs2015-32\map_editorWin32\Release\map_editor.exe bin\vs2015\map_editor-32.exe
copy /y vs2017-32\map_editorWin32\Release\map_editor.exe bin\vs2017\map_editor-32.exe
@@ -27,8 +27,8 @@ copy /y vs2017-32\map_editorWin32\Release\map_editor.exe bin\vs2017\map_editor-3
copy /y vs2015-32\zetaglest\zetaglest.exe bin\vs2015\zetaglest-32.exe
copy /y vs2017-32\zetaglest\zetaglest.exe bin\vs2017\zetaglest-32.exe
copy /y vs2015-64\g3dviewerx64\Release\g3dviewer.exe bin\vs2015\g3dviewer-64.exe
copy /y vs2017-64\g3dviewerx64\Release\g3dviewer.exe bin\vs2017\g3dviewer-64.exe
copy /y vs2015-64\g3d_viewerx64\Release\g3d_viewer.exe bin\vs2015\g3d_viewer-64.exe
copy /y vs2017-64\g3d_viewerx64\Release\g3d_viewer.exe bin\vs2017\g3d_viewer-64.exe
copy /y vs2015-64\map_editorx64\Release\map_editor.exe bin\vs2015\map_editor-64.exe
copy /y vs2017-64\map_editorx64\Release\map_editor.exe bin\vs2017\map_editor-64.exe

1
mk/windows/map_editor.rc Normal file
View File

@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "..\shared\map_editor.ico"

2
mk/windows/vs2015-32/ZetaGlest.sln
View File

@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
EndProject

12
mk/windows/vs2015-32/g3dviewer.vcxproj → mk/windows/vs2015-32/g3d_viewer.vcxproj
View File

@@ -12,9 +12,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FE5C7C7C-F109-44F5-8329-25A4E24F162C}</ProjectGuid>
<RootNamespace>g3dviewer</RootNamespace>
<RootNamespace>g3d_viewer</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>g3dviewer</ProjectName>
<ProjectName>g3d_viewer</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -90,10 +90,10 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3d_viewer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

2
mk/windows/vs2015-32/map_editor.vcxproj
View File

@@ -242,7 +242,7 @@
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest_editor.rc" />
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />

2
mk/windows/vs2015-32/zetaglest.vcxproj
View File

@@ -752,7 +752,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest.rc" />
<ResourceCompile Include="..\zetaglest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">

8
mk/windows/vs2015-64/g3d_viewer.vcxproj
View File

@@ -90,10 +90,10 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3d_viewer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

2
mk/windows/vs2015-64/map_editor.vcxproj
View File

@@ -316,7 +316,7 @@
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest_editor.rc" />
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />

2
mk/windows/vs2015-64/zetaglest.vcxproj
View File

@@ -564,7 +564,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest.rc" />
<ResourceCompile Include="..\zetaglest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">

2
mk/windows/vs2017-32/ZetaGlest.sln
View File

@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
EndProject

12
mk/windows/vs2017-32/g3dviewer.vcxproj → mk/windows/vs2017-32/g3d_viewer.vcxproj
View File

@@ -12,9 +12,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FE5C7C7C-F109-44F5-8329-25A4E24F162C}</ProjectGuid>
<RootNamespace>g3dviewer</RootNamespace>
<RootNamespace>g3d_viewer</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>g3dviewer</ProjectName>
<ProjectName>g3d_viewer</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -90,10 +90,10 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3d_viewer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

2
mk/windows/vs2017-32/map_editor.vcxproj
View File

@@ -242,7 +242,7 @@
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest_editor.rc" />
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />

2
mk/windows/vs2017-32/zetaglest.vcxproj
View File

@@ -752,7 +752,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest.rc" />
<ResourceCompile Include="..\zetaglest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">

8
mk/windows/vs2017-64/g3d_viewer.vcxproj
View File

@@ -90,10 +90,10 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3dviewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">g3d_viewer</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">g3d_viewer</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">false</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

2
mk/windows/vs2017-64/map_editor.vcxproj
View File

@@ -316,7 +316,7 @@
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest_editor.rc" />
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />

2
mk/windows/vs2017-64/zetaglest.vcxproj
View File

@@ -564,7 +564,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\glest.rc" />
<ResourceCompile Include="..\zetaglest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">

0
mk/windows/glest.rc → mk/windows/zetaglest.rc
View File