Made the direct window test environment optional, since it crashes the Dano
app_server... If you like to use it, define USE_DIRECT_WINDOW_TEST_MODE in the haiku_app_server Jamfile. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15504 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -21,13 +21,7 @@
|
|||||||
using std::nothrow;
|
using std::nothrow;
|
||||||
|
|
||||||
|
|
||||||
#ifdef __HAIKU__
|
#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
|
||||||
# define USE_ACCELERANT 1
|
|
||||||
#else
|
|
||||||
# define USE_ACCELERANT 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if USE_ACCELERANT
|
|
||||||
# include "AccelerantHWInterface.h"
|
# include "AccelerantHWInterface.h"
|
||||||
#else
|
#else
|
||||||
# include "ViewHWInterface.h"
|
# include "ViewHWInterface.h"
|
||||||
@@ -142,11 +136,12 @@ ScreenManager::_ScanDrivers()
|
|||||||
bool initDrivers = true;
|
bool initDrivers = true;
|
||||||
while (initDrivers) {
|
while (initDrivers) {
|
||||||
|
|
||||||
#if USE_ACCELERANT
|
#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
|
||||||
interface = new AccelerantHWInterface();
|
interface = new AccelerantHWInterface();
|
||||||
#else
|
#elif defined(USE_DIRECT_WINDOW_TEST_MODE)
|
||||||
interface = new DWindowHWInterface();
|
interface = new DWindowHWInterface();
|
||||||
// interface = new ViewHWInterface();
|
#else
|
||||||
|
interface = new ViewHWInterface();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_AddHWInterface(interface);
|
_AddHWInterface(interface);
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ UseFreeTypeHeaders ;
|
|||||||
|
|
||||||
# This overrides the definitions in private/servers/app/ServerConfig.h
|
# This overrides the definitions in private/servers/app/ServerConfig.h
|
||||||
local defines = [ FDefines TEST_MODE=1 ] ;
|
local defines = [ FDefines TEST_MODE=1 ] ;
|
||||||
|
# USE_DIRECT_WINDOW_TEST_MODE=1
|
||||||
|
|
||||||
SubDirCcFlags $(defines) ;
|
SubDirCcFlags $(defines) ;
|
||||||
SubDirC++Flags $(defines) ;
|
SubDirC++Flags $(defines) ;
|
||||||
|
|||||||
Reference in New Issue
Block a user