improved the library name map for haiku and host keeping the simpler name input_server
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18465 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -256,7 +256,7 @@ HAIKU_BUILD_DESCRIPTION ?= "Unknown Build" ;
|
|||||||
HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ;
|
HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ;
|
||||||
}
|
}
|
||||||
HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ;
|
HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ;
|
||||||
HAIKU_LIBRARY_NAME_MAP_/system/servers/input_server = <nogrist>input_server ;
|
HAIKU_LIBRARY_NAME_MAP_input_server = <nogrist>input_server ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -403,6 +403,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
|
|||||||
HOST_LIBROOT = root ;
|
HOST_LIBROOT = root ;
|
||||||
HOST_LIBBE = be ;
|
HOST_LIBBE = be ;
|
||||||
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR = ;
|
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR = ;
|
||||||
|
HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ;
|
||||||
} else {
|
} else {
|
||||||
HOST_LIBSTDC++ = stdc++ ;
|
HOST_LIBSTDC++ = stdc++ ;
|
||||||
HOST_LIBROOT = libroot_build.so ;
|
HOST_LIBROOT = libroot_build.so ;
|
||||||
@@ -561,7 +562,7 @@ if $(TARGET_PLATFORM) = haiku {
|
|||||||
|
|
||||||
TARGET_BOOT_PLATFORM = ;
|
TARGET_BOOT_PLATFORM = ;
|
||||||
|
|
||||||
TARGET_LIBRARY_NAME_MAP = ;
|
TARGET_LIBRARY_NAME_MAP = HOST_LIBRARY_NAME_MAP ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# define macro, for identifying the platform
|
# define macro, for identifying the platform
|
||||||
|
|||||||
@@ -7,5 +7,5 @@ UsePrivateHeaders input ;
|
|||||||
Addon <input>easypen : input_server/devices :
|
Addon <input>easypen : input_server/devices :
|
||||||
EasyPenInputDevice.cpp
|
EasyPenInputDevice.cpp
|
||||||
: false
|
: false
|
||||||
: be device <nogrist>input_server ;
|
: be device input_server ;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Addon <input>keyboard : input_server/devices :
|
|||||||
TMListItem.cpp
|
TMListItem.cpp
|
||||||
|
|
||||||
: false
|
: false
|
||||||
: /system/servers/input_server be ;
|
: input_server be ;
|
||||||
|
|
||||||
Package haiku-inputkit-cvs :
|
Package haiku-inputkit-cvs :
|
||||||
<input>keyboard :
|
<input>keyboard :
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ UsePrivateHeaders input ;
|
|||||||
Addon <input>mouse : input_server/devices :
|
Addon <input>mouse : input_server/devices :
|
||||||
MouseInputDevice.cpp
|
MouseInputDevice.cpp
|
||||||
: false
|
: false
|
||||||
: be /system/servers/input_server ;
|
: be input_server ;
|
||||||
|
|
||||||
Package haiku-inputkit-cvs :
|
Package haiku-inputkit-cvs :
|
||||||
<input>mouse :
|
<input>mouse :
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ Addon <input>serial_mouse : input_server/devices :
|
|||||||
MouseInputDevice.cpp
|
MouseInputDevice.cpp
|
||||||
SerialMouse.cpp
|
SerialMouse.cpp
|
||||||
: false
|
: false
|
||||||
: be device <nogrist>input_server ;
|
: be device input_server ;
|
||||||
|
|
||||||
Package haiku-inputkit-cvs :
|
Package haiku-inputkit-cvs :
|
||||||
<input>serial_mouse :
|
<input>serial_mouse :
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ UsePrivateHeaders input ;
|
|||||||
Addon <input>tablet : input_server/devices :
|
Addon <input>tablet : input_server/devices :
|
||||||
TabletInputDevice.cpp
|
TabletInputDevice.cpp
|
||||||
: false
|
: false
|
||||||
: be <nogrist>input_server ;
|
: be input_server ;
|
||||||
|
|
||||||
Package haiku-inputkit-cvs :
|
Package haiku-inputkit-cvs :
|
||||||
<input>tablet :
|
<input>tablet :
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ UsePrivateHeaders screen_saver ;
|
|||||||
Addon screen_saver : input_server/filters :
|
Addon screen_saver : input_server/filters :
|
||||||
ScreenSaverFilter.cpp
|
ScreenSaverFilter.cpp
|
||||||
: false
|
: false
|
||||||
: be libscreensaver.so <nogrist>input_server ;
|
: be libscreensaver.so input_server ;
|
||||||
|
|
||||||
Package haiku-screensaverkit-cvs :
|
Package haiku-screensaverkit-cvs :
|
||||||
screen_saver :
|
screen_saver :
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Addon canna : input_server/methods :
|
|||||||
KouhoWindow.cpp
|
KouhoWindow.cpp
|
||||||
PaletteWindow.cpp
|
PaletteWindow.cpp
|
||||||
: false
|
: false
|
||||||
: be textencoding <nogrist>input_server libcanna.a librk.a ;
|
: be textencoding input_server libcanna.a librk.a ;
|
||||||
|
|
||||||
Package haiku-cannaIM-cvs :
|
Package haiku-cannaIM-cvs :
|
||||||
canna :
|
canna :
|
||||||
|
|||||||
Reference in New Issue
Block a user