mpdecimal: Add version 4.0.0 #25896
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| diff --git a/libmpdec++/Makefile.vc b/libmpdec++/Makefile.vc | ||
| index 5985c33..bc2bdac 100644 | ||
| --- a/libmpdec++/Makefile.vc | ||
| +++ b/libmpdec++/Makefile.vc | ||
| @@ -14,11 +14,11 @@ LIBIMPORT_CXX = libmpdec++-4.0.0.dll.lib | ||
| LIBSHARED_CXX = libmpdec++-4.0.0.dll | ||
|
|
||
| !if "$(DEBUG)" == "1" | ||
| -OPT = /MTd /Od /Zi /EHsc | ||
| -OPT_SHARED = /MDd /Od /Zi /EHsc | ||
| +OPT = /Od /Zi /EHsc | ||
| +OPT_SHARED = /Od /Zi /EHsc | ||
| !else | ||
| -OPT = /MT /O2 /GS /EHsc /DNDEBUG | ||
| -OPT_SHARED = /MD /O2 /GS /EHsc /DNDEBUG | ||
| +OPT = /O2 /GS /EHsc /DNDEBUG | ||
| +OPT_SHARED = /O2 /GS /EHsc /DNDEBUG | ||
| !endif | ||
|
|
||
| !if "$(CC)" == "clang-cl" | ||
| @@ -27,9 +27,9 @@ WARN = /W4 -Wno-undefined-inline | ||
| WARN = /W4 | ||
| !endif | ||
|
|
||
| -MPD_CXXFLAGS = $(WARN) /nologo $(OPT) | ||
| -MPD_CXXFLAGS_SHARED = /DBUILD_LIBMPDECXX $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) | ||
| -MPD_BIN_CXXFLAGS_SHARED = $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) | ||
| +MPD_CXXFLAGS = $(WARN) /nologo $(OPT) $(CONAN_CXXFLAGS) $(CONAN_CFLAGS) | ||
| +MPD_CXXFLAGS_SHARED = /DBUILD_LIBMPDECXX $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) $(CONAN_LDFLAGS) | ||
| +MPD_BIN_CXXFLAGS_SHARED = $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) $(CONAN_LDFLAGS) | ||
|
There was a problem hiding this comment. Not sure if this section is still necessary, is this 1.x legacy? If so, I can remove from previous versions too. (there are a few other sections like this too) There was a problem hiding this comment. I'm removing these sections in my followup PR |
||
|
|
||
| MPD_LDXXFLAGS= /DLL /MANIFEST $(LDXXFLAGS) | ||
|
|
||
| @@ -42,22 +42,22 @@ OBJS = decimal.obj | ||
| SHARED_OBJS = .objs\decimal.obj | ||
|
|
||
|
|
||
| -$(LIBSTATIC_CXX): Makefile $(OBJS) | ||
| +$(LIBSTATIC_CXX): Makefile.vc $(OBJS) | ||
| -@if exist $@ del $(LIBSTATIC_CXX) | ||
| lib /out:$(LIBSTATIC_CXX) $(OBJS) | ||
|
|
||
| -$(LIBSHARED_CXX): Makefile $(SHARED_OBJS) | ||
| +$(LIBSHARED_CXX): Makefile.vc $(SHARED_OBJS) | ||
| -@if exist $@ del $(LIBSHARED_CXX) | ||
| link $(MPD_LDXXFLAGS) /out:$(LIBSHARED_CXX) /implib:$(LIBIMPORT_CXX) /LIBPATH:$(SRCDIR) $(SHARED_OBJS) $(LIBIMPORT) | ||
| mt -manifest $(LIBSHARED_CXX).manifest -outputresource:$(LIBSHARED_CXX);2 | ||
|
|
||
|
|
||
| decimal.obj:\ | ||
| -Makefile decimal.cc ..\libmpdec\mpdecimal.h decimal.hh | ||
| +Makefile.vc decimal.cc ..\libmpdec\mpdecimal.h decimal.hh | ||
| $(CXX) "-I." "-I$(SRCDIR)" $(MPD_CXXFLAGS) -c decimal.cc | ||
|
|
||
| .objs\decimal.obj:\ | ||
| -Makefile decimal.cc ..\libmpdec\mpdecimal.h decimal.hh | ||
| +Makefile.vc decimal.cc ..\libmpdec\mpdecimal.h decimal.hh | ||
| $(CXX) "-I." "-I$(SRCDIR)" $(MPD_CXXFLAGS_SHARED) -c decimal.cc /Fo.objs\decimal.obj | ||
|
|
||
|
|
||
| diff --git a/libmpdec/Makefile.vc b/libmpdec/Makefile.vc | ||
| index 7f72a4b..2ee3ddb 100644 | ||
| --- a/libmpdec/Makefile.vc | ||
| +++ b/libmpdec/Makefile.vc | ||
| @@ -31,11 +31,11 @@ CONFIG = /DCONFIG_32 /DANSI | ||
| !endif | ||
|
|
||
| !if "$(DEBUG)" == "1" | ||
| -OPT = /MTd /Od /Zi /EHsc | ||
| -OPT_SHARED = /MDd /Od /Zi /EHsc | ||
| +OPT = /Od /Zi /EHsc | ||
| +OPT_SHARED = /Od /Zi /EHsc | ||
| !else | ||
| -OPT = /MT /O2 /GS /EHsc /DNDEBUG | ||
| -OPT_SHARED = /MD /O2 /GS /EHsc /DNDEBUG | ||
| +OPT = /O2 /GS /EHsc /DNDEBUG | ||
| +OPT_SHARED = /O2 /GS /EHsc /DNDEBUG | ||
| !endif | ||
|
|
||
| !if "$(CC)" == "clang-cl" | ||
| @@ -44,13 +44,13 @@ WARN = /W4 /wd4200 /wd4204 /wd4221 -Wno-unknown-pragmas -Wno-undefined-inline /D | ||
| WARN = /W4 /wd4200 /wd4204 /wd4221 /D_CRT_SECURE_NO_WARNINGS | ||
| !endif | ||
|
|
||
| -MPD_CFLAGS = $(WARN) /nologo $(CONFIG) $(OPT) | ||
| -MPD_CFLAGS_SHARED = /DBUILD_LIBMPDEC $(WARN) /nologo $(CONFIG) $(OPT_SHARED) $(PGOFLAGS) | ||
| +MPD_CFLAGS = $(WARN) /nologo $(CONFIG) $(OPT) $(CONAN_CFLAGS) | ||
| +MPD_CFLAGS_SHARED = /DBUILD_LIBMPDEC $(WARN) /nologo $(CONFIG) $(OPT_SHARED) $(PGOFLAGS) $(CONAN_CFLAGS) | ||
|
|
||
| MPD_BIN_CFLAGS = $(WARN) /nologo $(OPT) | ||
| MPD_BIN_CFLAGS_SHARED = $(WARN) /nologo $(OPT_SHARED) $(PGOFLAGS) | ||
|
|
||
| -MPD_LDFLAGS= /DLL /MANIFEST $(LDFLAGS) | ||
| +MPD_LDFLAGS= /DLL /MANIFEST $(LDFLAGS) $(CONAN_LDFLAGS) | ||
|
|
||
|
|
||
| default: $(LIBSTATIC) $(LIBSHARED) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/libmpdec++/decimal.hh b/libmpdec++/decimal.hh | ||
| index 9040290..5e057cb 100644 | ||
| --- a/libmpdec++/decimal.hh | ||
| +++ b/libmpdec++/decimal.hh | ||
| @@ -58,7 +58,7 @@ | ||
| #ifdef _MSC_VER | ||
| #if defined (BUILD_LIBMPDECXX) | ||
| #define IMPORTEXPORT __declspec(dllexport) | ||
| - #elif defined(_DLL) | ||
| + #elif defined(MPDECIMAL_DLL) | ||
| #define IMPORTEXPORT __declspec(dllimport) | ||
| #else | ||
| #define IMPORTEXPORT | ||
| diff --git a/libmpdec/mpdecimal32vc.h b/libmpdec/mpdecimal32vc.h | ||
| index 6a35951..43e5631 100644 | ||
| --- a/libmpdec/mpdecimal32vc.h | ||
| +++ b/libmpdec/mpdecimal32vc.h | ||
| @@ -59,7 +59,7 @@ extern "C" { | ||
| #if defined (BUILD_LIBMPDEC) | ||
| #undef IMPORTEXPORT | ||
| #define IMPORTEXPORT __declspec(dllexport) | ||
| -#elif defined(_DLL) | ||
| +#elif defined(MPDECIMAL_DLL) | ||
| #undef IMPORTEXPORT | ||
| #define IMPORTEXPORT __declspec(dllimport) | ||
| #endif | ||
| diff --git a/libmpdec/mpdecimal64vc.h b/libmpdec/mpdecimal64vc.h | ||
| index 9320176..a9944fc 100644 | ||
| --- a/libmpdec/mpdecimal64vc.h | ||
| +++ b/libmpdec/mpdecimal64vc.h | ||
| @@ -59,7 +59,7 @@ extern "C" { | ||
| #if defined (BUILD_LIBMPDEC) | ||
| #undef IMPORTEXPORT | ||
| #define IMPORTEXPORT __declspec(dllexport) | ||
| -#elif defined(_DLL) | ||
| +#elif defined(MPDECIMAL_DLL) | ||
| #undef IMPORTEXPORT | ||
| #define IMPORTEXPORT __declspec(dllimport) | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This section is weird. For some reason, in the cache folder, most of the the files are symlinks in 4.0.0, but actual files in 2.5.1. So we need to copy from the source folder instead. But this only affects the
libmpdec++folder. In fact, making this change to thelibmpdecfolder causes the C header to not get packaged. I don't understand any of why this is the case, but it works like this.Also to note: I'm just being consistent here with the usage of
*_pathvariables, I know they're deprecated.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tested yet, but I'm hoping the weirdness will go away in the followup cleanup PR.