From d9fd546808af9b7f9edcdb1b2d673deeffb796e6 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sat, 9 May 2015 09:53:03 +0200 Subject: [PATCH] Native: resource files and headers --- MathNet.Numerics.NativeProviders.sln | 2 - src/NativeProviders/Common/resource.h | 14 --- src/NativeProviders/Common/resource.rc | 101 ------------------ .../Windows/ATLAS/ATLASWrapper.vcxproj | 3 + .../ATLAS/ATLASWrapper.vcxproj.filters | 5 + .../Windows/CUDA/CUDAWrapper.vcxproj | 3 + .../Windows/CUDA/CUDAWrapper.vcxproj.filters | 5 + .../Windows/MKL/MKLWrapper.vcxproj | 3 + .../Windows/MKL/MKLWrapper.vcxproj.filters | 5 + 9 files changed, 24 insertions(+), 117 deletions(-) delete mode 100644 src/NativeProviders/Common/resource.h delete mode 100644 src/NativeProviders/Common/resource.rc diff --git a/MathNet.Numerics.NativeProviders.sln b/MathNet.Numerics.NativeProviders.sln index a83444e8..25b52c6c 100644 --- a/MathNet.Numerics.NativeProviders.sln +++ b/MathNet.Numerics.NativeProviders.sln @@ -6,8 +6,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{5A0892FF-82CE-40FC-BCE1-73810C615F52}" ProjectSection(SolutionItems) = preProject src\NativeProviders\Common\lapack_common.h = src\NativeProviders\Common\lapack_common.h - src\NativeProviders\Common\resource.h = src\NativeProviders\Common\resource.h - src\NativeProviders\Common\resource.rc = src\NativeProviders\Common\resource.rc src\NativeProviders\Common\WindowsDLL.cpp = src\NativeProviders\Common\WindowsDLL.cpp src\NativeProviders\Common\wrapper_common.h = src\NativeProviders\Common\wrapper_common.h EndProjectSection diff --git a/src/NativeProviders/Common/resource.h b/src/NativeProviders/Common/resource.h deleted file mode 100644 index 27e2900c..00000000 --- a/src/NativeProviders/Common/resource.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by resource.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/NativeProviders/Common/resource.rc b/src/NativeProviders/Common/resource.rc deleted file mode 100644 index 13c0209e..00000000 --- a/src/NativeProviders/Common/resource.rc +++ /dev/null @@ -1,101 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "windows.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""windows.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,7,0,0 - PRODUCTVERSION 1,7,0,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "http://numerics.mathdotnet.com/" - VALUE "CompanyName", "Math.NET" - VALUE "FileDescription", "MathNET Numerics Native Provider" - VALUE "FileVersion", "1.7.0.0" - VALUE "InternalName", "Math.NET" - VALUE "LegalCopyright", "Copyright (C) Math.NET 2009-2014" - VALUE "OriginalFilename", "MathNet.Numerics" - VALUE "ProductName", "Math.NET Numerics" - VALUE "ProductVersion", "1.7.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj index 55eeaefa..11933afe 100644 --- a/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj +++ b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj @@ -155,6 +155,9 @@ + + + diff --git a/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters index 518bf6df..ddedf46f 100644 --- a/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters +++ b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters @@ -30,4 +30,9 @@ Source Files + + + Header Files + + \ No newline at end of file diff --git a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj index 476349ff..2544d23c 100644 --- a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj +++ b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj @@ -27,6 +27,9 @@ + + + {5A52B796-7F41-4C90-8DE2-F3F391C4482C} CUDA diff --git a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj.filters b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj.filters index c67ec930..1813cb6b 100644 --- a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj.filters +++ b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj.filters @@ -33,4 +33,9 @@ Source Files + + + Header Files + + \ No newline at end of file diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj index b2d46580..504a3317 100644 --- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj +++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj @@ -299,6 +299,9 @@ + + + diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters index 2a00620e..09081f53 100644 --- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters +++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters @@ -39,4 +39,9 @@ Resource Files + + + Header Files + + \ No newline at end of file