diff --git a/mk/linux/editor.ico b/mk/linux/editor.ico deleted file mode 100644 index 4f1073868..000000000 Binary files a/mk/linux/editor.ico and /dev/null differ diff --git a/mk/linux/editor.ico b/mk/linux/editor.ico new file mode 120000 index 000000000..1f52a3a2c --- /dev/null +++ b/mk/linux/editor.ico @@ -0,0 +1 @@ +../shared/editor.ico \ No newline at end of file diff --git a/mk/linux/g3dviewer.ico b/mk/linux/g3dviewer.ico deleted file mode 100644 index 0d2a9f342..000000000 Binary files a/mk/linux/g3dviewer.ico and /dev/null differ diff --git a/mk/linux/g3dviewer.ico b/mk/linux/g3dviewer.ico new file mode 120000 index 000000000..470ba0831 --- /dev/null +++ b/mk/linux/g3dviewer.ico @@ -0,0 +1 @@ +../shared/g3dviewer.ico \ No newline at end of file diff --git a/mk/linux/glest.ico b/mk/linux/glest.ico deleted file mode 100644 index 82d89e0c9..000000000 Binary files a/mk/linux/glest.ico and /dev/null differ diff --git a/mk/linux/glest.ico b/mk/linux/glest.ico new file mode 120000 index 000000000..39bea9ecf --- /dev/null +++ b/mk/linux/glest.ico @@ -0,0 +1 @@ +../shared/glest.ico \ No newline at end of file diff --git a/mk/linux/glestkeys.ini b/mk/linux/glestkeys.ini deleted file mode 100644 index 8d150748e..000000000 --- a/mk/linux/glestkeys.ini +++ /dev/null @@ -1,56 +0,0 @@ -; === propertyMap File === - -RenderInGamePerformance=` -RenderNetworkStatus=N -ShowFullConsole=M -Screenshot=E -FreeCameraMode=F -ResetCameraMode=space -CameraModeLeft=left -CameraModeRight=right -CameraModeUp=up -CameraModeDown=down -PauseGame=P -ChangeFontColor=C -GameSpeedIncrease='+' -GameSpeedDecrease='-' -ExitKey=escape -ExtraTeamColorMarker='*' -GroupUnitsKey1='0' -GroupUnitsKey2='1' -GroupUnitsKey3='2' -GroupUnitsKey4='3' -GroupUnitsKey5='4' -GroupUnitsKey6='5' -GroupUnitsKey7='6' -GroupUnitsKey8='7' -GroupUnitsKey9='8' -GroupUnitsKey10='9' -CameraRotateLeft=A -CameraRotateRight=D -CameraRotateUp=S -CameraRotateDown=W -HotKeyCenterCameraOnSelection=G -HotKeySelectIdleHarvesterUnit=I -HotKeySelectBuiltBuilding=B -HotKeyShowDebug=? -HotKeyDumpWorldToLog=\ -HotKeyRotateUnitDuringPlacement=R -HotKeySelectDamagedUnit=D -HotKeySelectStoreUnit=T -HotKeySelectedUnitsAttack=A -HotKeySelectedUnitsStop=S -HotKeyToggleOSMouseEnabled=/ -ChatTeamMode=H -ToggleMusic=K -SaveGUILayout=f10 -SetMarker=X -ReloadINI=f5 -TogglePhotoMode=f8 -SwitchLanguage=L -SaveGame=f11 -BookmarkAdd=f2 -BookmarkRemove=f3 -CameraFollowSelectedUnit=f4 -; === propertyMap File === - diff --git a/mk/linux/glestkeys.ini b/mk/linux/glestkeys.ini new file mode 120000 index 000000000..efb848625 --- /dev/null +++ b/mk/linux/glestkeys.ini @@ -0,0 +1 @@ +../shared/glestkeys.ini \ No newline at end of file diff --git a/mk/linux/megaglest.ico b/mk/linux/megaglest.ico deleted file mode 100644 index f2ce53b69..000000000 Binary files a/mk/linux/megaglest.ico and /dev/null differ diff --git a/mk/linux/megaglest.ico b/mk/linux/megaglest.ico new file mode 120000 index 000000000..12ec0aaf3 --- /dev/null +++ b/mk/linux/megaglest.ico @@ -0,0 +1 @@ +../shared/megaglest.ico \ No newline at end of file diff --git a/mk/linux/servers.ini b/mk/linux/servers.ini deleted file mode 100644 index 6d25fccd7..000000000 --- a/mk/linux/servers.ini +++ /dev/null @@ -1,6 +0,0 @@ -; === propertyMap File === - -Engineer1=78.47.225.60 -Engineer2=78.47.225.60:61457 -Summoner1=124.109.2.127 -This computer=127.0.0.1 diff --git a/mk/linux/servers.ini b/mk/linux/servers.ini new file mode 120000 index 000000000..d5e819692 --- /dev/null +++ b/mk/linux/servers.ini @@ -0,0 +1 @@ +../shared/servers.ini \ No newline at end of file diff --git a/mk/windoze/megaglest_editor.ico b/mk/shared/editor.ico similarity index 100% rename from mk/windoze/megaglest_editor.ico rename to mk/shared/editor.ico diff --git a/mk/windoze/megaglest_g3dviewer.ico b/mk/shared/g3dviewer.ico similarity index 100% rename from mk/windoze/megaglest_g3dviewer.ico rename to mk/shared/g3dviewer.ico diff --git a/mk/windoze/glest.ico b/mk/shared/glest.ico similarity index 100% rename from mk/windoze/glest.ico rename to mk/shared/glest.ico diff --git a/mk/windoze/glestkeys.ini b/mk/shared/glestkeys.ini similarity index 100% rename from mk/windoze/glestkeys.ini rename to mk/shared/glestkeys.ini diff --git a/mk/windoze/megaglest.ico b/mk/shared/megaglest.ico similarity index 100% rename from mk/windoze/megaglest.ico rename to mk/shared/megaglest.ico diff --git a/mk/windoze/servers.ini b/mk/shared/servers.ini similarity index 100% rename from mk/windoze/servers.ini rename to mk/shared/servers.ini diff --git a/mk/windoze/CopySharedBinarySetup.bat b/mk/windoze/CopySharedBinarySetup.bat new file mode 100644 index 000000000..600658c6d --- /dev/null +++ b/mk/windoze/CopySharedBinarySetup.bat @@ -0,0 +1,5 @@ +@echo off + +copy ..\shared\*.* ..\..\data\glest_game\ + +if not "%1" == "nopause" pause