Skip to content

Commit

Permalink
Updated #include path for moved location of external headers.
Browse files Browse the repository at this point in the history
Fixed minor problems with #includes.
Updated README file for external includes.
  • Loading branch information
AndrewWPhillips committed Oct 4, 2016
1 parent a97537e commit 5ca65ab
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
4 changes: 2 additions & 2 deletions HexEdit/CalcDlg.h
@@ -1,6 +1,6 @@
// CalcDlg.h : header file for Calculator Dialog // 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 // 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. // you can do what you want with it and I take no responsibility for bugs.
Expand All @@ -19,7 +19,7 @@
#include "Expr.h" #include "Expr.h"
#include "optypes.h" #include "optypes.h"
#include "ResizeCtrl.h" #include "ResizeCtrl.h"
#include "mpirxx.h" #include <mpirxx.h>


// Just override CMFCButton so we can ceck the button colour // Just override CMFCButton so we can ceck the button colour
class CCalcButton : public CMFCButton class CCalcButton : public CMFCButton
Expand Down
4 changes: 2 additions & 2 deletions HexEdit/HexEdit.vcxproj
Expand Up @@ -51,9 +51,9 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies 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> <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> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath> <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath> <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath>
Expand Down
7 changes: 7 additions & 0 deletions HexEdit/Preview.h
@@ -1,4 +1,11 @@
// Preview.h - header for CPreview class // 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 #pragma once
// CPreview - used to display preview bitmap in file open dialog // CPreview - used to display preview bitmap in file open dialog
Expand Down
12 changes: 7 additions & 5 deletions ThirdParty/include/README.TXT
@@ -1,8 +1,10 @@
This include sub-directory contains header files used to interface to external libraries. This ..\ThirdParty\include sub-directory contains header files used to
These files are not part of HexEdit but are placed here for convenience. interface to external libraries. These files are not part of HexEdit.
Note that not all Boost and Crypto++ headers are included - only those need to build 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/tuple/tuple.hpp - for when pair<> is not enough
boost/crc.hpp - fast standard CRCs plus custom CRCs boost/crc.hpp - fast standard CRCs plus custom CRCs
Expand All @@ -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) 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 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.