diff options
| -rw-r--r-- | RepositoryFixes.mk | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 1ee99551da38..175f9cbda64c 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -66,7 +66,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILENAMES)) # libpyuno_wrapper.dll => pyuno.pyd -gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno.pyd,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd,$(gb_Library_DLLFILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index c5029863f1fa..5dba2c7db5e3 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -48,7 +48,11 @@ File gid_File_Lib_Pyuno #ifdef UNX Name = STRING(CONCAT2(libpyuno,UNXSUFFIX)); #else + #ifdef MSVC_PKG_DEBUG_RUNTIME + Name = "pyuno_d.pyd"; + #else Name = "pyuno.pyd"; + #endif // MSVC_PKG_DEBUG_RUNTIME #endif Dir = gid_Brand_Dir_Program; Styles = (PACKED); |