Sync changes from upstream repository

Co-authored-by: Alain <alain@mcneel.com>
Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: Bozo <bozo@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Giulio Piacentino <giulio@mcneel.com>
Co-authored-by: John Croudy <croudyj@gmail.com>
Co-authored-by: Mikko Oksanen <mikko@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo The Builder
2022-08-08 05:51:20 -07:00
parent beeb16ad7e
commit 7eae26b304
930 changed files with 799452 additions and 799464 deletions

View File

@@ -1,30 +1,30 @@
#if defined(ON_COMPILER_MSC)
// This file is specific to Micrsoft's compiler.
// It contains linking pragmas for building the opennurbs examples.
#pragma once
#if defined(OPENNURBS_EXPORTS) || defined(ON_COMPILING_OPENNURBS)
// If you get the following error, your compiler settings
// indicate you are building an opennurbs library.
// This file is used for linking with opennurbs libraries
// that have been previously built.
#error This file contains linking pragmas for using the opennurbs library.
#endif
#if defined(OPENNURBS_IMPORTS)
#pragma message( " --- dynamically linking opennurbs (DLL)." )
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "opennurbs_public.lib" "\"")
#else
#pragma message( " --- statically linking opennurbs." )
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "opennurbs_public_staticlib.lib" "\"")
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "zlib.lib" "\"")
#if defined(OPENNURBS_FREETYPE_SUPPORT)
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "freetype263.lib" "\"")
#endif
#pragma comment(lib, "rpcrt4.lib")
#pragma comment(lib, "shlwapi.lib")
#endif
#endif
#if defined(ON_COMPILER_MSC)
// This file is specific to Micrsoft's compiler.
// It contains linking pragmas for building the opennurbs examples.
#pragma once
#if defined(OPENNURBS_EXPORTS) || defined(ON_COMPILING_OPENNURBS)
// If you get the following error, your compiler settings
// indicate you are building an opennurbs library.
// This file is used for linking with opennurbs libraries
// that have been previously built.
#error This file contains linking pragmas for using the opennurbs library.
#endif
#if defined(OPENNURBS_IMPORTS)
#pragma message( " --- dynamically linking opennurbs (DLL)." )
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "opennurbs_public.lib" "\"")
#else
#pragma message( " --- statically linking opennurbs." )
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "opennurbs_public_staticlib.lib" "\"")
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "zlib.lib" "\"")
#if defined(OPENNURBS_FREETYPE_SUPPORT)
#pragma comment(lib, "\"" OPENNURBS_OUTPUT_DIR "/" "freetype263.lib" "\"")
#endif
#pragma comment(lib, "rpcrt4.lib")
#pragma comment(lib, "shlwapi.lib")
#endif
#endif