ICE: rev 3.48

AME: fix
kgersen · Jan 14, 2018 · 128225e · 128225e
1 parent f392319
commit 128225e
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 14 deletions.
diff --git a/AME/AGM.rc b/AME/AGM.rc
@@ -645,8 +645,6 @@ END
 // remains consistent on all systems.
 IDR_MAINFRAME           ICON                    "res\\Agmlogo.ico"
 
-IDR_MAINFRAME1          ICON                    "res\\idr_main.ico"
-
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/AME/AME.vcxproj b/AME/AME.vcxproj
@@ -59,7 +59,7 @@
       <Command>copy "$(ProjectDir)\..\ICE\External\FreeImage\Dist\FreeImage.dll" "$(OutDir)"
 </Command>
       <Inputs>..\ICE\External\FreeImage\Dist\FreeImage.dll;%(Inputs)</Inputs>
-      <Outputs>$(OutDir)FreeImage.dll;%(Outputs)</Outputs>
+      <Outputs>$(OutDir)\FreeImage.dll;%(Outputs)</Outputs>
     </CustomBuildStep>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -98,7 +98,7 @@
       <Command>copy "$(ProjectDir)\..\ICE\External\FreeImage\Dist\FreeImage.dll" "$(OutDir)"
 </Command>
       <Inputs>..\ICE\External\FreeImage\Dist\FreeImage.dll;%(Inputs)</Inputs>
-      <Outputs>$(OutDir)FreeImage.dll;%(Outputs)</Outputs>
+      <Outputs>$(OutDir)\FreeImage.dll;%(Outputs)</Outputs>
     </CustomBuildStep>
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -195,7 +195,6 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\Agmlogo.ico" />
-    <Image Include="res\idr_main.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/AME/AME.vcxproj.filters b/AME/AME.vcxproj.filters
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\ICE\IGCCore.cpp" />
+    <ClCompile Include="2DMap.cpp" />
+    <ClCompile Include="AGM.cpp" />
+    <ClCompile Include="AlephDlg.cpp" />
+    <ClCompile Include="BaseDlg.cpp" />
+    <ClCompile Include="BitmapGlue.cpp" />
+    <ClCompile Include="BMPMDLButton.cpp" />
+    <ClCompile Include="ColorButton.cpp" />
+    <ClCompile Include="GetNumDlg.cpp" />
+    <ClCompile Include="IGCMap.cpp" />
+    <ClCompile Include="MAPDlg.cpp" />
+    <ClCompile Include="MDLFile.cpp" />
+    <ClCompile Include="RandomDlg.cpp" />
+    <ClCompile Include="RockDlg.cpp" />
+    <ClCompile Include="RocksLayoutDlg.cpp" />
+    <ClCompile Include="RockTpl.cpp" />
+    <ClCompile Include="RockTplDlg.cpp" />
+    <ClCompile Include="SectDlg.cpp" />
+    <ClCompile Include="SectWnd.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\ICE\corestruct.h" />
+    <ClInclude Include="2DMap.h" />
+    <ClInclude Include="AGM.h" />
+    <ClInclude Include="AlephDlg.h" />
+    <ClInclude Include="BaseDlg.h" />
+    <ClInclude Include="BitmapGlue.h" />
+    <ClInclude Include="BMPMDLButton.h" />
+    <ClInclude Include="ColorButton.h" />
+    <ClInclude Include="GetNumDlg.h" />
+    <ClInclude Include="IGCMap.h" />
+    <ClInclude Include="MAPDlg.h" />
+    <ClInclude Include="mapstruct.h" />
+    <ClInclude Include="MDLFile.h" />
+    <ClInclude Include="RandomDlg.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="RockDlg.h" />
+    <ClInclude Include="RocksLayoutDlg.h" />
+    <ClInclude Include="RockTpl.h" />
+    <ClInclude Include="RockTplDlg.h" />
+    <ClInclude Include="SectDlg.h" />
+    <ClInclude Include="SectWnd.h" />
+    <ClInclude Include="ServerCtrl.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="readme.htm" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="res">
+      <UniqueIdentifier>{3b3a1053-95e7-4b95-b346-b487c6a96b99}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="AGM.rc">
+      <Filter>res</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\Agmlogo.ico">
+      <Filter>res</Filter>
+    </Image>
+  </ItemGroup>
+</Project>
diff --git a/AME/res/idr_main.ico b/AME/res/idr_main.ico
diff --git a/AME/resource.h b/AME/resource.h
@@ -44,7 +44,6 @@
 #define IDD_ROCKDLG                     129
 #define IDM_ADDROCKSLAYOUT              129
 #define IDM_TPL_ALEPHS                  134
-#define IDR_MAINFRAME1                  135
 #define IDM_TPL_ROCKS                   135
 #define IDM_TPL_SECTORS                 136
 #define IDD_ROCKTPLDLG                  137
@@ -337,7 +336,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        140
+#define _APS_NEXT_RESOURCE_VALUE        141
 #define _APS_NEXT_COMMAND_VALUE         32774
 #define _APS_NEXT_CONTROL_VALUE         1234
 #define _APS_NEXT_SYMED_VALUE           145

diff --git a/ICE/ICE.APS b/ICE/ICE.APS
diff --git a/ICE/ICE.rc b/ICE/ICE.rc
@@ -84,7 +84,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     ICON            IDR_MAINFRAME,IDC_STATIC,7,7,20,20
     DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
-    LTEXT           "Copyright (C) 2001-2017 Kirth Gersen (KGJV)",IDC_STATIC,40,25,188,8
+    LTEXT           "Copyright (C) 2001-2018 Kirth Gersen (KGJV)",IDC_STATIC,40,25,188,8
     LTEXT           "[email protected]",IDC_STATIC,40,39,119,8
     LTEXT           "Logo by Nick Thoman (NoodleNT)",IDC_STATIC,40,50,179,8
     LTEXT           "Other decoders: Your_Persona, EvanTaylor, tpaganj, Vlymoxyd",IDC_STATIC,39,72,179,21
@@ -1338,6 +1338,10 @@ BEGIN
         BOTTOMMARGIN, 276
     END
 
+    IDD_MISSILEDLG, DIALOG
+    BEGIN
+    END
+
     IDD_PROBEDLG, DIALOG
     BEGIN
         BOTTOMMARGIN, 276
@@ -1391,8 +1395,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,7,0
- PRODUCTVERSION 3,4,7,0
+ FILEVERSION 3,4,8,0
+ PRODUCTVERSION 3,4,8,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1410,12 +1414,12 @@ BEGIN
             VALUE "Comments", "IGC Core Editor"
             VALUE "CompanyName", "Kirth Gersen/KGJV "
             VALUE "FileDescription", "IGC Core Editor"
-            VALUE "FileVersion", "3.47"
-            VALUE "InternalName", "2017-09-02"
-            VALUE "LegalCopyright", "Copyright (C) Kirth Gersen 2001-2017"
+            VALUE "FileVersion", "3.4.8.0"
+            VALUE "InternalName", "2018-01-15"
+            VALUE "LegalCopyright", "Copyright (C) Kirth Gersen 2001-2018"
             VALUE "OriginalFilename", "ICE.EXE"
             VALUE "ProductName", "ICE"
-            VALUE "ProductVersion", "3.47"
+            VALUE "ProductVersion", "3.4.8.0"
         END
     END
     BLOCK "VarFileInfo"