Egalware/opennurbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ON_compile :

Browse Source 
- correzione errori già testati.
This commit is contained in:
Daniele Bariletti
2023-10-09 17:10:48 +02:00
parent 6cbad2284a
commit f85758173b
9 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opennurbs.h
+2
View File
@@ -21,6 +21,8 @@
//
////////////////////////////////////////////////////////////////
#pragma warning (disable:4189)
#if !defined(OPENNURBS_INC_)
#define OPENNURBS_INC_
opennurbs_defines.h
+2 -2
View File
@@ -2148,7 +2148,7 @@ public:
os_perpendicular = 0x80000,
os_tangent = 0x200000,
os_point = 0x08000000,
os_all_snaps = 0xFFFFFFFF
os_all_snaps = 0xFFFFFFFu
};
static osnap_mode OSnapMode(int); // convert integer to osnap_mode enum
@@ -2473,7 +2473,7 @@ public:
dim_centermark_point = 105,
dim_leader_point = 106,
no_type = 0xFFFFFFFF
no_type = 0xFFFFFFFu
};
/*
opennurbs_dimension.h
+1 -1
View File
@@ -18,7 +18,7 @@
#define OPENNURBS_DIMENSION_INC_
#if defined(ON_DLL_TEMPLATE)
ON_DLL_TEMPLATE template ON_ClassArray< class ON_DimStyle >;
ON_DLL_TEMPLATE template class ON_ClassArray< class ON_DimStyle >;
#endif
class ON_CLASS ON_Dimension : public ON_Annotation
opennurbs_lock.h
+1 -1
View File
@@ -115,7 +115,7 @@ private:
#if defined(ON_COMPILER_CLANG)
std::atomic<int> m_lock_value;
#else
std::atomic<int> m_lock_value = ON_Lock::UnlockedValue;
std::atomic<int> m_lock_value = {ON_Lock::UnlockedValue};
#endif
#pragma ON_PRAGMA_WARNING_POP
};
opennurbs_object_history.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ public:
// each value type must have a case in ON_Value::CreateValue().
force_32bit_enum = 0xFFFFFFFF
force_32bit_enum = 0xFFFFFFFu
};
static
opennurbs_public.vcxproj
+11 -9
View File
@@ -22,31 +22,31 @@
<ProjectGuid>{1356641D-0B22-4123-B519-A69EE5CDC7F8}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>opennurbs_public</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>ClangCL</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>ClangCL</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>ClangCL</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>ClangCL</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -91,7 +91,7 @@
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>opennurbs.h</PrecompiledHeaderFile>
<Optimization>MaxSpeed</Optimization>
<Optimization>Disabled</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENNURBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,7 +108,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>opennurbs.h</PrecompiledHeaderFile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;OPENNURBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;OPENNURBS_EXPORTS;__clang;ON_COMPILER_CLANG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<OpenMPSupport>true</OpenMPSupport>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
@@ -126,9 +126,11 @@
<Optimization>Disabled</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;OPENNURBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;OPENNURBS_EXPORTS;OPENNURBS_ZLIB_LIB_DIR="C:/EgtDev/Extern/zlib/Lib";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<AdditionalOptions>-Wc++11-narrowing %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
opennurbs_public_staticlib.vcxproj
+1
View File
@@ -129,6 +129,7 @@
<SDLCheck>true</SDLCheck>
<PrecompiledHeaderFile>opennurbs.h</PrecompiledHeaderFile>
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
opennurbs_text.h
+3 -3
View File
@@ -19,9 +19,9 @@
#define OPENNURBS_TEXT_H_INCLUDED
#if defined(ON_DLL_TEMPLATE)
ON_DLL_TEMPLATE template ON_ClassArray< class ON_Font >;
ON_DLL_TEMPLATE template ON_SimpleArray< class ON_TextRun* >;
ON_DLL_TEMPLATE template ON_SimpleArray< class ON_FontGlyph* >;
ON_DLL_TEMPLATE template class ON_ClassArray< class ON_Font >;
ON_DLL_TEMPLATE template class ON_SimpleArray< class ON_TextRun* >;
ON_DLL_TEMPLATE template class ON_SimpleArray< class ON_FontGlyph* >;
#endif
#define ON_TEXT_BRACKET_FRACTION
zlib/zlib.vcxproj
+1
View File
@@ -142,6 +142,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>