Age | Commit message (Collapse) | Author |
|
Durring the threading-refactor, there were several places where calls to CThreads::WaitForSingleObject was replaced with calls to the replacement for ::WaitForSingleObject. The CThreads version of the call would return when the thread was stopped. This fix puts back that behavior in the places that were it was originally.
Also incorporated elupus' comments on style and which approach to use.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Adding USB device detection support for Windows and Multiple keymap support for keyboards
|
|
|
|
added: when a usb device is activated or removed, tell KeymapLoader about it
|
|
|
|
|
|
This reverts commit edbd033e0c912a3789e96f321aaadd6aac2ce590.
|
|
|
|
|
|
|
|
use the API for other things
|
|
|
|
|
|
External pythong changes. Credit WiSo
[WIN32] don't load python with our dll loader if USE_EXTERNAL_PYTHON is defined
[WIN32] added osdefs.h for DELIM
[WIN32] removed check for zlib.pyd. its in the core now
[WIN32] unified log message
[WIN32] set the PYTHONPATH within MSVCR90.DLL in order for python to pick it up
[WIN32] external python doesn't need special wrapping and the path to the dll
[WIN32] set some more python related env vars (might be removed from emu_msvcrt.cpp in future?)
Fixed the error message for missing msvcrt dll so that it happens when the error condition occurrs.
[WIN32] fixed: ext python should work now. Needs tests on win32 as I'm on win64
[WIN32] fixed: the putenv source got missing
[WIN32] removed DetectDVDtype.*
[WIN32] cosmetics
There's no reason to make a special case for osx when looking to acquire the python thread lock prior to the Py_Initialize.
[WIN32] added delayed loaded dlls to the opengl project target
|
|
Fixed the external python to work without the Dll proxies. Fixed XBPython.cpp so that even though it's directly linked, it works correctly allowing scripts to run multiple times. This included removing the Py_NO_SHARED_ENABLED and adding the USE_EXTERNAL_PYTHON. We now need to: set PYTHONPATH in the code, fix the debug linking, move the preprocessor changes to other builds besides Debug OpenGL.
[WIN32] renamed python download deps.
[WIN32] renamed python download deps.
[WIN32] changed: we don't have debug libs for vanilla python. credit WiSo
[WIN32] copy python dll to the debug directory - credit WiSo
[WIN32] copy sdl.dll to the debug directory
[WIN32] copy python dll to dependencies. Credit WiSo
[WIN32] fixed dep script file
[WIN32] download stripped down version of python 2.6.6
[WIN32] enable external python (missing commit)
fixed some settings on the two windows release configurations
|
|
credit goes to mostly WiSo and blinkseb.
[WIN32] added include/python to the include path and removed lib/python/PC
[WIN32] added python27.lib to the linker
[WIN32] removed Py_NO_ENABLE_SHARED
Still need the python directory that was under system because linux internal python build still put things there.
There is a bug in the Windows external python because on Windows, the DLL that python is linked against may not be the DLL that xbmc is linked against. So passing a FILE* to python from an fopen has the potential to crash. This resolves that problem. Credit to blinkseb.
added: download python dependencies with our script.
changed: use Python 2.6.6 on Windows. Debug build is included in the archive, but not copied by default. Set DEBUG to true to copy these.
[WIN32] changed: in case of debug python is used, be sure to exclude it from our installer
[WIN32] fixed: get debug python working. The following has to be defined:
- Py_NO_ENABLE_SHARED
- Py_TRACE_REFS
[WIN32] fixed: oups...
[WIN32] changed: got external python work. It needs more testing to be sure. We don't link against a .lib to be able to load python from where we want (that's why Py_NO_ENABLE_SHARED is defined). We don't define USE_EXTERNAL_PYTHON because we need to use our dll loader.
Fixed a couple of problems: 1) The Makefile.in file was merged incorrectly. 2) We cannot call PyEval_AcquireLock prior to the threads being initialized in linux.
OSX shouldn't build the internal python ... ever ... but especially when USE_EXTERNAL_PYTHON is set.
|
|
cptspiff,WiSo,blinkseb, and jcarroll
changed: limit the scope of the python includes. this will be useful in an upcomming patch. credit jcarroll
changed: use a m4 check to set the python path directly, and ditch the old hardcoded version nonsense. credit jcarroll
Fixed the build for when --enable-external-python is not used.
Fixed the warnings due to Python.h not being the first header as required by Python.
Final fix to the osx make build so that external python works. Needed to change the m4 macro to account for .dylib on osx and the dependant ./configure call to pass the installed location of the python xbmc is to be built against. Also updated .gitignore for the osx dependency builds.
There was a name collision between the python datetime.h and the xbmc/DateTime.h on file systems that are not case sensitive. This is now fixed by renaming DateTime.h to XBDateTime.h
By request, the .cpp files now sorted alphabetically in the Makefile.in.
the m4 macros is a mess of mixed spaces and tabs. In order to make my couple line change more readable I changed the spaces to tabs so it would be consistent with the surrounding area. This was per the request of jmarshall.
Fixed an error where under internal python the correct header wasn't being used.
if --enable-external-python is selected then don't build the internal python at all and not using any of the wrappers.
Modified the xcode project to work with the external python changes.
There was a bug in the Makefile.in where the internal python build target wasn't being set correctly. This is now fixed.
[WIN32] removed some uneeded files, renamed DateTime* to XBDateTime* and defined USE_EXTERNAL_PYTHON
Added xbmc/cores/DllLoader/Makefile to .gitignore since it's being autogened.
Made it so that the distinction between internal and external python is limited to mostly just Makefile's now. Most of the code no longer needs to make the distinction. This should make it much easier to move forward in windows and eventually with removing the internal python.
updated: .gitignore
|
|
|
|
|
|
paths across platforms
|
|
value not important.
|
|
Gives about about 5% faster compile time for xbmc/ and xbmc/filesystem on my system.
|
|
No one seems to know why we're setting the share status of the log. Not
doing so doesn't seem to affect it in any way, including copying the
file while XBMC is running as was hinted in the original commit
(5e2ec0ca) implied. Use _wfopen instead of _wsfopen.
|
|
|
|
|
|
|
|
Squashed commit due to build breakage during code-reshuffle history.
Conflicts:
xbmc/Util.cpp
xbmc/cdrip/CDDARipper.cpp
xbmc/filesystem/Directory.cpp
xbmc/filesystem/File.cpp
|
|
This reverts commit 4e98a514c6a2975ec234fe19fe058e7e74bcfb7d, reversing
changes made to 8d73cbde1dcd240d80bee9301d0321703a15c995.
|
|
|
|
UmountShare)
|
|
|
|
|
|
Fixed conflicts:
system/keymaps/keyboard.xml
|
|
|
|
to fellbeast
|
|
Conflicts:
.gitignore
|
|
|
|
|
|
to git somehow.
|
|
|
|
|
|
Fixed conflicts:
addons/skin.confluence/720p/DialogFullScreenInfo.xml
addons/skin.confluence/720p/Home.xml
addons/skin.confluence/720p/PlayerControls.xml
addons/skin.confluence/720p/Settings.xml
addons/skin.confluence/720p/SettingsSystemInfo.xml
addons/skin.confluence/720p/VideoFullScreen.xml
addons/skin.confluence/720p/VideoOSD.xml
addons/skin.confluence/720p/custom_SkinSetting_1111.xml
addons/skin.confluence/720p/defaults.xml
addons/skin.confluence/720p/includes.xml
addons/skin.confluence/language/English/strings.xml
language/Dutch/strings.xml
project/VS2008Express/XBMC for Windows.sln
project/VS2008Express/XBMC.vcproj
project/VS2008Express/guilib.vcproj
xbmc/addons/AddonDll.h
|
|
|
|
|