Changeset 1564 in vbox
- Timestamp:
- Mar 20, 2007 1:27:04 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 7 edited
-
Config.kmk (modified) (4 diffs)
-
configure (modified) (3 diffs)
-
src/VBox/Frontends/VBoxBFE/Makefile (modified) (1 diff)
-
src/VBox/Frontends/VBoxFB/Makefile (modified) (1 diff)
-
src/VBox/Frontends/VBoxSDL/Makefile (modified) (1 diff)
-
src/VBox/Runtime/Makefile (modified) (3 diffs)
-
src/VBox/Runtime/r3/linux/uuid-linux.cpp (deleted)
-
src/libs/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r1546 r1564 702 702 703 703 # Overridable libraries (unix). 704 LIB_UUID ?= uuid705 704 LIB_PTHREAD ?= pthread 706 705 LIB_XCURSOR ?= Xcursor … … 1329 1328 -Wl,--rpath-link,$(L4_LIBDIR) 1330 1329 ifeq ($(BUILD_TARGET),linux) 1331 TEMPLATE_VBOXR3EXE_LIBS = pthread m $(LIB_UUID)rt dl1330 TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl 1332 1331 else ifeq ($(BUILD_TARGET),l4) 1333 1332 TEMPLATE_VBOXR3EXE_LIBS = \ … … 1545 1544 TEMPLATE_VBOXMAINEXE_INCS += $(VBOX_XPCOM_INCS) 1546 1545 ifeq ($(BUILD_TARGET),linux) 1547 TEMPLATE_VBOXMAINEXE_LIBS = pthread m $(LIB_UUID)rt1546 TEMPLATE_VBOXMAINEXE_LIBS = pthread m rt 1548 1547 else ifeq ($(BUILD_TARGET),l4) 1549 1548 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) … … 1792 1791 TEMPLATE_VBOXBLDPROG_CXXFLAGS.kprofile = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release) 1793 1792 ifeq ($(BUILD_PLATFORM),linux) 1794 TEMPLATE_VBOXBLDPROG_LIBS = pthread m $(LIB_UUID)rt dl1793 TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl 1795 1794 else ifeq ($(BUILD_PLATFORM),os2) 1796 1795 TEMPLATE_VBOXBLDPROG_TOOL = GCC3OMF -
trunk/configure
r1542 r1564 43 43 INCXERCES="" 44 44 LIBXERCES="-lxerces-c" 45 LIBUUID="-luuid"46 45 INCSDL="/usr/include/SDL" 47 46 LIBSDL="-lSDL" … … 512 511 513 512 # 514 # Check for uuid, needed by Runtime, VBoxSVC, VBoxSDL, and VBoxBFE515 #516 function check_uuid()517 {518 test_header uuid519 echo '520 #include <cstdio>521 #include <uuid/uuid.h>522 extern "C" int main(void)523 {524 uuid_t uu;525 uuid_clear(uu);526 if (uuid_is_null(uu)) {527 printf("found, OK.\n");528 return 0;529 } else {530 printf("uuid found but does not work\n");531 return 1;532 }533 }534 ' > .tmp_src.cc535 if test_compile $LIBUUID uuid uuid; then536 if test_execute; then537 cnf_append "LIB_UUID" `echo $LIBUUID|sed 's+-l++'`538 fi539 fi540 }541 542 #543 513 # Check for openssl, needed for RDP 544 514 # … … 1207 1177 (($WITH_XPCOM==1)) && check_xerces 1208 1178 (($WITH_LIBIDL==1)) && check_libidl 1209 [ "$OS" != "darwin" ] && check_uuid1210 1179 (($OSE==0)) && check_ssl 1211 1180 [ "$OS" != "darwin" ] && check_pthread -
trunk/src/VBox/Frontends/VBoxBFE/Makefile
r994 r1564 101 101 VBoxBFE_LIBS.linux = \ 102 102 $(LIB_RUNTIME) \ 103 $(LIB_UUID) \104 103 $(LIB_XCURSOR) 105 104 VBoxBFE_LIBS.l4 = \ -
trunk/src/VBox/Frontends/VBoxFB/Makefile
r1 r1564 41 41 $(LIB_PTHREAD) \ 42 42 rt \ 43 $(LIB_UUID) \44 43 directfb 45 44 VBoxFB_LIBPATH = \ -
trunk/src/VBox/Frontends/VBoxSDL/Makefile
r798 r1564 79 79 $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 80 80 VBoxSDL_LIBS.linux = \ 81 $(LIB_UUID) \82 81 $(LIB_XCURSOR) 83 82 VBoxSDL_LDFLAGS.darwin = \ -
trunk/src/VBox/Runtime/Makefile
r1456 r1564 123 123 endif 124 124 RuntimeR3_INCS.l4 = \ 125 $(PATH_ROOT)/src/libs/libuuid \126 125 $(L4_INCDIR) 127 126 # for iconv.h … … 386 385 RuntimeR3L4_TEMPLATE = VBOXR3NP 387 386 RuntimeR3L4_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF LDR_WITH_PE 388 RuntimeR3L4_INCS = $(L4_INCDIR) \ 389 $(PATH_ROOT)/src/libs/libuuid 387 RuntimeR3L4_INCS = $(L4_INCDIR) 390 388 391 389 RuntimeR3L4_SOURCES = \ … … 490 488 endif 491 489 VBoxRT_LIBS.l4 = \ 492 $(PATH_LIB)/VBox-uuid$(VBOX_SUFF_LIB) \493 490 $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) 494 491 -
trunk/src/libs/Makefile.kmk
r601 r1564 23 23 24 24 25 subdirs.l4 = libuuid ## @todo Use uuid-generic.cpp !26 25 subdirs := liblzf-1.51 $(subdirs.$(BUILD_TARGET)) 27 26 ifndef VBOX_OSE
Note:
See TracChangeset
for help on using the changeset viewer.

