From 7eb9da3ac1fe50c880f13c537a7c7e12aba17968 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Thu, 3 Mar 2011 22:09:24 +0000 Subject: [PATCH] geom2d project --- windows/geom2d.vcproj | 375 +++++++++++++++++++++++++++++++++++ windows/netgen-4.9.14.sln | 16 ++ windows/netgen-4.9.14.vcproj | 38 ++-- windows/netgen.rc | 159 ++++++++++----- 4 files changed, 512 insertions(+), 76 deletions(-) create mode 100644 windows/geom2d.vcproj diff --git a/windows/geom2d.vcproj b/windows/geom2d.vcproj new file mode 100644 index 00000000..709a910c --- /dev/null +++ b/windows/geom2d.vcproj @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/netgen-4.9.14.sln b/windows/netgen-4.9.14.sln index 349f56d3..6db0d8e9 100644 --- a/windows/netgen-4.9.14.sln +++ b/windows/netgen-4.9.14.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netgen", "netgen-4.9.14.vcproj", "{87468946-A594-4101-81A4-A131F35261EF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geom2d", "geom2d.vcproj", "{D9FE218C-E915-4F94-A667-763EA182ABD5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug(OCC)|Win32 = Debug(OCC)|Win32 @@ -31,6 +33,20 @@ Global {87468946-A594-4101-81A4-A131F35261EF}.Release|Win32.Build.0 = Release|Win32 {87468946-A594-4101-81A4-A131F35261EF}.Release|x64.ActiveCfg = Release|x64 {87468946-A594-4101-81A4-A131F35261EF}.Release|x64.Build.0 = Release|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug(OCC)|Win32.ActiveCfg = Debug|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug(OCC)|x64.ActiveCfg = Debug|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug(OCC)|x64.Build.0 = Debug|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|Win32.ActiveCfg = Debug|Win32 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|Win32.Build.0 = Debug|Win32 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|x64.ActiveCfg = Debug|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|x64.Build.0 = Debug|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release(OCC)|Win32.ActiveCfg = Release|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release(OCC)|x64.ActiveCfg = Release|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release(OCC)|x64.Build.0 = Release|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|Win32.ActiveCfg = Release|Win32 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|Win32.Build.0 = Release|Win32 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|x64.ActiveCfg = Release|x64 + {D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/netgen-4.9.14.vcproj b/windows/netgen-4.9.14.vcproj index f768d378..9d604aed 100644 --- a/windows/netgen-4.9.14.vcproj +++ b/windows/netgen-4.9.14.vcproj @@ -320,7 +320,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" WholeProgramOptimization="true" - AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w64\include"" + AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w64\include";$(NOINHERIT)" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -1076,11 +1076,11 @@ > + + @@ -1235,6 +1239,10 @@ RelativePath="..\libsrc\geom2d\splinegeometry.hpp" > + + @@ -1312,11 +1320,11 @@ > - - - - - - - - @@ -1881,10 +1873,6 @@ RelativePath="..\libsrc\visualization\vsfieldlines.cpp" > - - diff --git a/windows/netgen.rc b/windows/netgen.rc index 5e98913a..5152a82d 100644 --- a/windows/netgen.rc +++ b/windows/netgen.rc @@ -1,51 +1,108 @@ -#include - -// -------------------------------------------------- -// File and Product Version information. -// Displayed in the "Version" Tab in Windows -// Explorer after right clicking on the EXE File -#define FILE_VERSION 4,9,11,0 -#define FILE_VERSION_STR "4.9.11\0" - -#define PRODUCT_VERSION 4,9,11,0 -#define PRODUCT_VERSION_STR "4.9.11\0" -// -------------------------------------------------- - -// Add the Netgen icon to the executable -100 ICON netgen.ico - -// Version Data (modify the above DEFINE statements as required) -VS_VERSION_INFO VERSIONINFO -FILEVERSION FILE_VERSION -PRODUCTVERSION PRODUCT_VERSION -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS VS_FF_PRERELEASE -#endif -FILEOS VOS__WINDOWS32 -FILETYPE VFT_APP -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "Netgen Meshing Software\0" - VALUE "FileVersion", FILE_VERSION_STR - VALUE "InternalName", "Netgen\0" - VALUE "LegalCopyright", "GNU Public License (GPL)\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename","Netgen.exe\0" - VALUE "ProductName", "Netgen\0" - VALUE "ProductVersion", PRODUCT_VERSION_STR - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - +// Microsoft Visual C++ generated resource script. +// +#include "resource." + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Deutsch (Deutschland) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +100 ICON "netgen.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 4,9,14,0 + PRODUCTVERSION 4,9,14,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x3L +#else + FILEFLAGS 0x2L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Vienna UT" + VALUE "FileDescription", "Netgen Meshing Software" + VALUE "FileVersion", "4.9.14" + VALUE "InternalName", "Netgen" + VALUE "LegalCopyright", "GNU Public License (GPL)" + VALUE "OriginalFilename", "Netgen.exe" + VALUE "ProductName", "Netgen" + VALUE "ProductVersion", "4.9.14" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // Deutsch (Deutschland) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +