GitHub-Proxy/draco
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/google/draco synced 2025-08-11 05:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Visual Studio build + updated makefiles

Browse Source
This commit is contained in:
Ondrej Stava 2017-08-01 11:37:58 -07:00
parent 4503028fb7
commit 7c8cd74271
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -36,7 +36,6 @@ if (ENABLE_MESH_COMPRESSION)
endif () endif ()
endif () endif ()
# Turn on more compiler warnings. # Turn on more compiler warnings.
if (ENABLE_EXTRA_WARNINGS) if (ENABLE_EXTRA_WARNINGS)
if (MSVC) if (MSVC)

1
Makefile.decoder.emcc
View File

@ -38,7 +38,6 @@ endif
######### #########
DEFINES := $(DRACO_CONFIG_DEFINES) DEFINES := $(DRACO_CONFIG_DEFINES)
DEFINES += -DDRACO_INTERNAL_1_0_0
INCLUDES := -I../../ -I./ -I./src/ INCLUDES := -I../../ -I./ -I./src/
SRCDIR := src/draco SRCDIR := src/draco
OBJDIR := obj OBJDIR := obj

1
Makefile.encoder.emcc
View File

@ -38,7 +38,6 @@ endif
######### #########
DEFINES := $(DRACO_CONFIG_DEFINES) DEFINES := $(DRACO_CONFIG_DEFINES)
DEFINES += -DDRACO_INTERNAL_1_0_0
INCLUDES := -I../../ -I./ -I./src/ INCLUDES := -I../../ -I./ -I./src/
SRCDIR := src/draco SRCDIR := src/draco
OBJDIR := obj OBJDIR := obj

15
src/draco/core/statusor.h
View File

@ -58,22 +58,13 @@ class StatusOr {
}; };
// In case StatusOr<T> is ok(), this macro assigns value stored in StatusOr<T> // In case StatusOr<T> is ok(), this macro assigns value stored in StatusOr<T>
// to |lhs|, otherwise it returns the error Status. |error_expression| can be // to |lhs|, otherwise it returns the error Status.
// used to provide custom return expressions.
// //
// DRACO_ASSIGN_OR_RETURN(lhs, expression) // DRACO_ASSIGN_OR_RETURN(lhs, expression)
// DRACO_ASSIGN_OR_RETURN(lhs, expression, error_expression);
// //
#define DRACO_ASSIGN_OR_RETURN(...) \ #define DRACO_ASSIGN_OR_RETURN(lhs, expression) \
DRACO_SELECT_NTH_FROM_3(__VA_ARGS__, DRACO_ASSIGN_OR_RETURN_3_, \
DRACO_ASSIGN_OR_RETURN_2_) \
(__VA_ARGS__)
#define DRACO_ASSIGN_OR_RETURN_2_(lhs, expression) \
DRACO_ASSIGN_OR_RETURN_3_(lhs, expression, _status)
#define DRACO_ASSIGN_OR_RETURN_3_(lhs, expression, error_expression) \
DRACO_ASSIGN_OR_RETURN_IMPL_(DRACO_MACROS_IMPL_CONCAT_(_statusor, __LINE__), \ DRACO_ASSIGN_OR_RETURN_IMPL_(DRACO_MACROS_IMPL_CONCAT_(_statusor, __LINE__), \
lhs, expression, error_expression) lhs, expression, _status)
// The actual implementation of the above macro. // The actual implementation of the above macro.
#define DRACO_ASSIGN_OR_RETURN_IMPL_(statusor, lhs, expression, error_expr) \ #define DRACO_ASSIGN_OR_RETURN_IMPL_(statusor, lhs, expression, error_expr) \