Added support for COMPILE_FOR_R5 flag, it enables to launch input_server without libopenbeos.so
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8612 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1144,7 +1144,11 @@ int InputServer::DispatchEvent(BMessage *message)
|
|||||||
PRINT(("[DispatchEvent] x = %lu:\n", xValue));
|
PRINT(("[DispatchEvent] x = %lu:\n", xValue));
|
||||||
|
|
||||||
port_id pid = find_port(SERVER_INPUT_PORT);
|
port_id pid = find_port(SERVER_INPUT_PORT);
|
||||||
BPortLink *appsvrlink = new BPortLink(pid);
|
|
||||||
|
// BPortLink is incompatible with R5 one
|
||||||
|
#ifndef COMPILE_FOR_R5
|
||||||
|
|
||||||
|
BPortLink *appsvrlink = new BPortLink(pid);
|
||||||
switch(message->what){
|
switch(message->what){
|
||||||
case B_MOUSE_MOVED:{
|
case B_MOUSE_MOVED:{
|
||||||
// get point and button from msg
|
// get point and button from msg
|
||||||
@@ -1334,6 +1338,9 @@ int InputServer::DispatchEvent(BMessage *message)
|
|||||||
|
|
||||||
}
|
}
|
||||||
delete appsvrlink;
|
delete appsvrlink;
|
||||||
|
|
||||||
|
#endif // COMPILE_FOR_R5
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
SubDir OBOS_TOP src servers input ;
|
SubDir OBOS_TOP src servers input ;
|
||||||
|
|
||||||
|
if $(COMPILE_FOR_R5) {
|
||||||
|
SubDirC++Flags -DCOMPILE_FOR_R5 ;
|
||||||
|
}
|
||||||
|
|
||||||
AddResources input_server : input_server.rdef ;
|
AddResources input_server : input_server.rdef ;
|
||||||
|
|
||||||
UsePrivateHeaders app ;
|
UsePrivateHeaders app ;
|
||||||
@@ -19,9 +23,14 @@ Server input_server :
|
|||||||
AddOnMonitorHandler.cpp
|
AddOnMonitorHandler.cpp
|
||||||
NodeMonitorHandler.cpp
|
NodeMonitorHandler.cpp
|
||||||
|
|
||||||
: be <boot!home!config!lib>libopenbeos.so
|
: be
|
||||||
;
|
;
|
||||||
|
|
||||||
|
if $(COMPILE_FOR_R5) {
|
||||||
|
} else {
|
||||||
|
LinkSharedOSLibs input_server : <boot!home!config!lib>libopenbeos.so ;
|
||||||
|
}
|
||||||
|
|
||||||
SEARCH on [ FGristFiles AddOnMonitor.cpp
|
SEARCH on [ FGristFiles AddOnMonitor.cpp
|
||||||
AddOnMonitorHandler.cpp
|
AddOnMonitorHandler.cpp
|
||||||
NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;
|
NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;
|
||||||
|
|||||||
Reference in New Issue
Block a user