Permalink
Browse files

Updated #include path for moved location of external headers.

Fixed minor problems with #includes.
Updated README file for external includes.
  • Loading branch information...
1 parent a97537e commit 5ca65ab6b02455f0e1fd636787fb6a33a10db027 @AndrewWPhillips committed Oct 4, 2016
Showing with 18 additions and 9 deletions.
  1. +2 −2 HexEdit/CalcDlg.h
  2. +2 −2 HexEdit/HexEdit.vcxproj
  3. +7 −0 HexEdit/Preview.h
  4. +7 −5 ThirdParty/include/README.TXT
View
@@ -1,6 +1,6 @@
// CalcDlg.h : header file for Calculator Dialog
//
-// Copyright (c) 2015 by Andrew W. Phillips
+// Copyright (c) 2016 by Andrew W. Phillips
//
// This file is distributed under the MIT license, which basically says
// you can do what you want with it and I take no responsibility for bugs.
@@ -19,7 +19,7 @@
#include "Expr.h"
#include "optypes.h"
#include "ResizeCtrl.h"
-#include "mpirxx.h"
+#include <mpirxx.h>
// Just override CMFCButton so we can ceck the button colour
class CCalcButton : public CMFCButton
@@ -51,9 +51,9 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)\include;$(IncludePath)</IncludePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)\..\ThirdParty\include;$(IncludePath)</IncludePath>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;$(IncludePath)</IncludePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\..\ThirdParty\include;$(IncludePath)</IncludePath>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath>
View
@@ -1,4 +1,11 @@
// Preview.h - header for CPreview class
+//
+// Copyright (c) 2016 by Andrew W. Phillips
+//
+// This file is distributed under the MIT license, which basically says
+// you can do what you want with it and I take no responsibility for bugs.
+// See http://www.opensource.org/licenses/mit-license.php for full details.
+//
#pragma once
// CPreview - used to display preview bitmap in file open dialog
@@ -1,8 +1,10 @@
-This include sub-directory contains header files used to interface to external libraries.
-These files are not part of HexEdit but are placed here for convenience.
-Note that not all Boost and Crypto++ headers are included - only those need to build HexEdit.
+This ..\ThirdParty\include sub-directory contains header files used to
+interface to external libraries. These files are not part of HexEdit.
+
+Note that NOT all Boost headers are included - only those needed to build HexEdit.
+
+Current library versions used are Boost 1.60, FreeImage 3.17.0, MPIR 2.3.0.
-Current library versions used are Boost 1.60, FreeImage 3.17.0, MPIR 2.3.0, Crypto++ 5.6.3.
boost/tuple/tuple.hpp - for when pair<> is not enough
boost/crc.hpp - fast standard CRCs plus custom CRCs
@@ -11,4 +13,4 @@ boost/* - other boost 1.60.0 supporting headers
FreeImage.h - defines interface to the FreeImage library used in many parts of HexEdit (esp. Aerial View)
mpir.h/mpirxx.h - C and C++ interfaces to MPIR (mult. precision ints & rationals) used in calculator
-Note Crypto++ header files are now found in ..\..\ThirdParty\CryptoPP
+Note: Crypto++ header files are now found in ..\..\ThirdParty\CryptoPP.

0 comments on commit 5ca65ab

Please sign in to comment.