Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -108,10 +108,6 @@ endmacro(add_lldb_definitions) if (NOT LLDB_DISABLE_PYTHON) - if (MSVC) - # this definition will stop python from auto linking python27_d.lib when Python.h is included - add_definitions( -DSWIG_PYTHON_INTERPRETER_NO_DEBUG ) - endif() find_package(PythonLibs REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS}) endif() Index: include/lldb/lldb-python.h =================================================================== --- include/lldb/lldb-python.h +++ include/lldb/lldb-python.h @@ -15,44 +15,16 @@ #ifdef LLDB_DISABLE_PYTHON // Python is disabled in this build #else - // If this is a visual studio build - #if defined( _MSC_VER ) - // Special case for debug build since python unfortunately - // adds library to the linker path through a #pragma directive - #if defined( _DEBUG ) - // Python forces a header link to python27_d.lib when building debug. - // To get around this (because most python packages for Windows - // don't come with debug python libraries), we undefine _DEBUG, include - // python.h and then restore _DEBUG. - - // The problem with this is that any system level headers included from - // python.h were also effectively included in 'release' mode when we undefined - // _DEBUG. To work around this we include headers that python includes - // before undefining _DEBUG. - # include - // Undefine to force python to link against the release distro - # undef _DEBUG - # include - # define _DEBUG - - #else - #include - #endif - - #else - #if defined(__linux__) - // features.h will define _POSIX_C_SOURCE if _GNU_SOURCE is defined. This value - // may be different from the value that Python defines it to be which results - // in a warning. Undefine _POSIX_C_SOURCE before including Python.h The same - // holds for _XOPEN_SOURCE. - #undef _POSIX_C_SOURCE - #undef _XOPEN_SOURCE - #endif - - // Include python for non windows machines - #include - + #if defined(__linux__) + // features.h will define _POSIX_C_SOURCE if _GNU_SOURCE is defined. This value + // may be different from the value that Python defines it to be which results + // in a warning. Undefine _POSIX_C_SOURCE before including Python.h The same + // holds for _XOPEN_SOURCE. + #undef _POSIX_C_SOURCE + #undef _XOPEN_SOURCE #endif + + #include #endif // LLDB_DISABLE_PYTHON #endif // LLDB_lldb_python_h_ Index: scripts/Python/finishSwigPythonLLDB.py =================================================================== --- scripts/Python/finishSwigPythonLLDB.py +++ scripts/Python/finishSwigPythonLLDB.py @@ -128,7 +128,6 @@ strPkgName = vstrPkgDir; strPkgName = "lldb" + strPkgName.replace( "/", "." ); - strPkgName = os.path.normcase( strPkgName ); strPkgDir = vstrFrameworkPythonDir; strPkgDir += vstrPkgDir; @@ -139,8 +138,7 @@ for strPkgFile in vListPkgFiles: if os.path.exists( strPkgFile ) and os.path.isfile( strPkgFile ): - strPyFile = os.path.normcase( strPkgFile ); - shutil.copy( strPyFile, strPkgDir ); + shutil.copy( strPkgFile, strPkgDir ); # Create a packet init files if there wasn't one strPkgIniFile = strPkgDir + "/__init__.py"; @@ -151,8 +149,7 @@ strPyScript = "__all__ = ["; strDelimiter = ""; for strPkgFile in vListPkgFiles: - strPyFile = os.path.normcase( strPkgFile ); - if os.path.exists( strPyFile ) and os.path.isfile( strPyFile ): + if os.path.exists( strPkgFile ) and os.path.isfile( strPkgFile ): strBaseName = os.path.basename( strPkgFile ); nPos = strBaseName.find( "." ); if nPos != -1: