- Timestamp:
- May 15, 2018 3:04:04 PM (7 years ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r72216 r72217 171 171 172 172 173 # 174 # VirtualBox Virtual Machine Application 175 # 176 VirtualBoxRT_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE) 177 VirtualBoxRT_NAME = VirtualBoxRT 178 VirtualBoxRT_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) 179 180 VirtualBoxRT_DEFS = VBOX_RUNTIME_UI 181 VirtualBoxRT_DEFS.debug = VBOX_CHECK_STATE # QT_FATAL_ASSERT 182 VirtualBoxRT_DEFS.linux = VBOX_WS_X11 183 VirtualBoxRT_DEFS.solaris = VBOX_WS_X11 184 VirtualBoxRT_DEFS.freebsd = VBOX_WS_X11 185 VirtualBoxRT_DEFS.darwin = VBOX_WS_MAC 186 VirtualBoxRT_DEFS.win = VBOX_WS_WIN 187 VirtualBoxRT_DEFS.linux += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS 188 VirtualBoxRT_DEFS.solaris += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS 189 VirtualBoxRT_DEFS.freebsd += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS 190 VirtualBoxRT_DEFS.darwin += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS 191 VirtualBoxRT_DEFS.win += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS 192 VirtualBoxRT_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS 193 VirtualBoxRT_DEFS.win += UNICODE QT_DLL 194 VirtualBoxRT_DEFS += \ 173 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 174 # 175 # VirtualBox Virtual Machine Application 176 # 177 VirtualBoxRT_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE) 178 VirtualBoxRT_NAME = VirtualBoxRT 179 VirtualBoxRT_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) 180 181 VirtualBoxRT_DEFS = VBOX_RUNTIME_UI 182 VirtualBoxRT_DEFS.debug = VBOX_CHECK_STATE # QT_FATAL_ASSERT 183 VirtualBoxRT_DEFS.linux = VBOX_WS_X11 184 VirtualBoxRT_DEFS.solaris = VBOX_WS_X11 185 VirtualBoxRT_DEFS.freebsd = VBOX_WS_X11 186 VirtualBoxRT_DEFS.darwin = VBOX_WS_MAC 187 VirtualBoxRT_DEFS.win = VBOX_WS_WIN 188 VirtualBoxRT_DEFS.linux += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS 189 VirtualBoxRT_DEFS.solaris += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS 190 VirtualBoxRT_DEFS.freebsd += VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS 191 VirtualBoxRT_DEFS.darwin += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS 192 VirtualBoxRT_DEFS.win += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS 193 VirtualBoxRT_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS 194 VirtualBoxRT_DEFS.win += UNICODE QT_DLL 195 VirtualBoxRT_DEFS += \ 195 196 $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \ 196 197 $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \ … … 218 219 $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \ 219 220 $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) 220 ifdef VBOX_WITH_DEBUGGER_GUI221 VirtualBoxRT_DEFS += VBOX_WITH_DEBUGGER_GUI222 if "$(KBUILD_TYPE)" != "release"223 VirtualBoxRT_DEFS += VBOX_WITH_DEBUGGER_GUI_MENU224 endif225 endif226 ifdef VBOX_WITH_VIDEOHWACCEL227 VirtualBoxRT_DEFS += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL228 else ifdef VBOX_GUI_USE_QGL229 VirtualBoxRT_DEFS += VBOX_GUI_USE_QGL230 endif231 ifdef VBOX_WITH_LIBCURL232 VirtualBoxRT_DEFS += VBOX_GUI_WITH_NETWORK_MANAGER233 VBOX_GUI_WITH_NETWORK_MANAGER := 1234 endif235 ifneq ($(KBUILD_TYPE),release)236 VirtualBoxRT_DEFS += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI237 endif238 ifdef VBOX_WITH_ICHAT_THEATER239 VirtualBoxRT_DEFS.darwin += VBOX_WITH_ICHAT_THEATER240 endif241 242 243 #244 # VirtualBox - GUI Global Shared Library.245 #246 VBoxGlobal_TEMPLATE = VBOXQTGUI247 VBoxGlobal_NAME = VBoxGlobal248 VBoxGlobal_DEFS =249 VBoxGlobal_DEFS += VBOX_GUI_LIBRARY250 VBoxGlobal_DEFS.darwin = VBOX_WS_MAC251 VBoxGlobal_DEFS.freebsd = VBOX_WS_X11252 VBoxGlobal_DEFS.linux = VBOX_WS_X11253 VBoxGlobal_DEFS.solaris = VBOX_WS_X11254 VBoxGlobal_DEFS.win = VBOX_WS_WIN255 VBoxGlobal_DEFS.debug = VBOX_CHECK_STATE # QT_FATAL_ASSERT256 VBoxGlobal_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS257 #VBoxGlobal_DEFS.win += UNICODE QT_DLL258 VBoxGlobal_DEFS += \221 ifdef VBOX_WITH_DEBUGGER_GUI 222 VirtualBoxRT_DEFS += VBOX_WITH_DEBUGGER_GUI 223 if "$(KBUILD_TYPE)" != "release" 224 VirtualBoxRT_DEFS += VBOX_WITH_DEBUGGER_GUI_MENU 225 endif 226 endif 227 ifdef VBOX_WITH_VIDEOHWACCEL 228 VirtualBoxRT_DEFS += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL 229 else ifdef VBOX_GUI_USE_QGL 230 VirtualBoxRT_DEFS += VBOX_GUI_USE_QGL 231 endif 232 ifdef VBOX_WITH_LIBCURL 233 VirtualBoxRT_DEFS += VBOX_GUI_WITH_NETWORK_MANAGER 234 VBOX_GUI_WITH_NETWORK_MANAGER := 1 235 endif 236 ifneq ($(KBUILD_TYPE),release) 237 VirtualBoxRT_DEFS += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI 238 endif 239 ifdef VBOX_WITH_ICHAT_THEATER 240 VirtualBoxRT_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 241 endif 242 243 244 # 245 # VirtualBox - GUI Global Shared Library. 246 # 247 VBoxGlobal_TEMPLATE = VBOXQTGUI 248 VBoxGlobal_NAME = VBoxGlobal 249 VBoxGlobal_DEFS = 250 VBoxGlobal_DEFS += VBOX_GUI_LIBRARY 251 VBoxGlobal_DEFS.darwin = VBOX_WS_MAC 252 VBoxGlobal_DEFS.freebsd = VBOX_WS_X11 253 VBoxGlobal_DEFS.linux = VBOX_WS_X11 254 VBoxGlobal_DEFS.solaris = VBOX_WS_X11 255 VBoxGlobal_DEFS.win = VBOX_WS_WIN 256 VBoxGlobal_DEFS.debug = VBOX_CHECK_STATE # QT_FATAL_ASSERT 257 VBoxGlobal_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS 258 #VBoxGlobal_DEFS.win += UNICODE QT_DLL 259 VBoxGlobal_DEFS += \ 259 260 $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \ 260 261 $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \ … … 274 275 $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \ 275 276 $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) 276 ifdef VBOX_WITH_DEBUGGER_GUI 277 VBoxGlobal_DEFS += VBOX_WITH_DEBUGGER_GUI 278 if "$(KBUILD_TYPE)" != "release" 279 VBoxGlobal_DEFS += VBOX_WITH_DEBUGGER_GUI_MENU 280 endif 281 endif 282 ifdef VBOX_WITH_VIDEOHWACCEL 283 VBoxGlobal_DEFS += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL 284 else ifdef VBOX_GUI_USE_QGL 285 VBoxGlobal_DEFS += VBOX_GUI_USE_QGL 286 endif 287 ifdef VBOX_WITH_LIBCURL 288 VBoxGlobal_DEFS += VBOX_GUI_WITH_NETWORK_MANAGER 289 VBOX_GUI_WITH_NETWORK_MANAGER := 1 290 endif 291 ifneq ($(KBUILD_TYPE),release) 292 VBoxGlobal_DEFS += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI 293 endif 294 ifdef VBOX_WITH_ICHAT_THEATER 295 VBoxGlobal_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 277 ifdef VBOX_WITH_DEBUGGER_GUI 278 VBoxGlobal_DEFS += VBOX_WITH_DEBUGGER_GUI 279 if "$(KBUILD_TYPE)" != "release" 280 VBoxGlobal_DEFS += VBOX_WITH_DEBUGGER_GUI_MENU 281 endif 282 endif 283 ifdef VBOX_WITH_VIDEOHWACCEL 284 VBoxGlobal_DEFS += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL 285 else ifdef VBOX_GUI_USE_QGL 286 VBoxGlobal_DEFS += VBOX_GUI_USE_QGL 287 endif 288 ifdef VBOX_WITH_LIBCURL 289 VBoxGlobal_DEFS += VBOX_GUI_WITH_NETWORK_MANAGER 290 VBOX_GUI_WITH_NETWORK_MANAGER := 1 291 endif 292 ifneq ($(KBUILD_TYPE),release) 293 VBoxGlobal_DEFS += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI 294 endif 295 ifdef VBOX_WITH_ICHAT_THEATER 296 VBoxGlobal_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 297 endif 296 298 endif 297 299 … … 354 356 $(VBOX_GRAPHICS_INCS) 355 357 356 # 357 # VirtualBox Virtual Machine Application 358 # Include folders. 359 # 360 VirtualBoxRT_INCS = \ 358 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 359 # 360 # VirtualBox Virtual Machine Application 361 # Include folders. 362 # 363 VirtualBoxRT_INCS = \ 361 364 $(VBOX_GUI_INC_DIRS) \ 362 365 $(VirtualBoxRT_0_OUTDIR)/include \ … … 364 367 $(VBOX_GRAPHICS_INCS) 365 368 366 #367 # VirtualBox - GUI Global Shared Library.368 # Include folders.369 #370 VBoxGlobal_INCS = \369 # 370 # VirtualBox - GUI Global Shared Library. 371 # Include folders. 372 # 373 VBoxGlobal_INCS = \ 371 374 $(VBOX_GUI_INC_DIRS) \ 372 375 $(VBoxGlobal_0_OUTDIR)/include 376 endif 373 377 374 378 … … 411 415 412 416 413 # 414 # VirtualBox Virtual Machine Application 415 # Compiling/linking flags. 416 # 417 ifneq ($(KBUILD_TARGET),win) 418 VirtualBoxRT_CXXFLAGS += -Wno-switch 419 endif 420 421 ## @todo we're using a number of deprecated APIs, please fix and remove these! 422 ifdef VBOX_WITH_NEW_XCODE 423 VirtualBoxRT_CXXFLAGS.darwin += -Wno-error=deprecated-declarations 424 VirtualBoxRT_OBJCFLAGS.darwin += -Wno-error=deprecated-declarations 425 VirtualBoxRT_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations 426 else 427 VirtualBoxRT_CXXFLAGS.darwin += -Wno-deprecated-declarations 428 VirtualBoxRT_OBJCFLAGS.darwin += -Wno-deprecated-declarations 429 VirtualBoxRT_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations 430 endif 431 432 ifeq ($(KBUILD_TYPE),release) 433 VirtualBoxRT_LDFLAGS.win += /SUBSYSTEM:windows 434 else 435 VirtualBoxRT_LDFLAGS.linux += -rdynamic # for backtrace_symbols() 436 VirtualBoxRT_LDFLAGS.win += /SUBSYSTEM:console 437 endif 438 439 VirtualBoxRT_LDFLAGS.darwin = \ 417 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 418 # 419 # VirtualBox Virtual Machine Application 420 # Compiling/linking flags. 421 # 422 ifneq ($(KBUILD_TARGET),win) 423 VirtualBoxRT_CXXFLAGS += -Wno-switch 424 endif 425 426 ## @todo we're using a number of deprecated APIs, please fix and remove these! 427 ifdef VBOX_WITH_NEW_XCODE 428 VirtualBoxRT_CXXFLAGS.darwin += -Wno-error=deprecated-declarations 429 VirtualBoxRT_OBJCFLAGS.darwin += -Wno-error=deprecated-declarations 430 VirtualBoxRT_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations 431 else 432 VirtualBoxRT_CXXFLAGS.darwin += -Wno-deprecated-declarations 433 VirtualBoxRT_OBJCFLAGS.darwin += -Wno-deprecated-declarations 434 VirtualBoxRT_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations 435 endif 436 437 ifeq ($(KBUILD_TYPE),release) 438 VirtualBoxRT_LDFLAGS.win += /SUBSYSTEM:windows 439 else 440 VirtualBoxRT_LDFLAGS.linux += -rdynamic # for backtrace_symbols() 441 VirtualBoxRT_LDFLAGS.win += /SUBSYSTEM:console 442 endif 443 444 VirtualBoxRT_LDFLAGS.darwin = \ 440 445 -framework AppKit -framework Carbon -framework IOKit \ 441 446 $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBoxRT.dylib) 442 ifdef VBOX_WITH_ICHAT_THEATER443 VirtualBoxRT_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore444 endif445 446 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)447 VirtualBoxRT_LDFLAGS.darwin += -framework OpenGL448 endif449 450 451 #452 # VirtualBox - GUI Global Shared Library.453 # Compiling/linking flags.454 #455 456 ## @todo we're using a number of deprecated APIs, please fix and remove these!457 ifdef VBOX_WITH_NEW_XCODE458 VBoxGlobal_CXXFLAGS.darwin += -Wno-error=deprecated-declarations459 VBoxGlobal_OBJCFLAGS.darwin += -Wno-error=deprecated-declarations460 VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations461 else462 VBoxGlobal_CXXFLAGS.darwin += -Wno-deprecated-declarations463 VBoxGlobal_OBJCFLAGS.darwin += -Wno-deprecated-declarations464 VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations465 endif466 467 VBoxGlobal_LDFLAGS.darwin = \447 ifdef VBOX_WITH_ICHAT_THEATER 448 VirtualBoxRT_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore 449 endif 450 451 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 452 VirtualBoxRT_LDFLAGS.darwin += -framework OpenGL 453 endif 454 455 456 # 457 # VirtualBox - GUI Global Shared Library. 458 # Compiling/linking flags. 459 # 460 461 ## @todo we're using a number of deprecated APIs, please fix and remove these! 462 ifdef VBOX_WITH_NEW_XCODE 463 VBoxGlobal_CXXFLAGS.darwin += -Wno-error=deprecated-declarations 464 VBoxGlobal_OBJCFLAGS.darwin += -Wno-error=deprecated-declarations 465 VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations 466 else 467 VBoxGlobal_CXXFLAGS.darwin += -Wno-deprecated-declarations 468 VBoxGlobal_OBJCFLAGS.darwin += -Wno-deprecated-declarations 469 VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations 470 endif 471 472 VBoxGlobal_LDFLAGS.darwin = \ 468 473 -framework AppKit -framework Carbon -framework IOKit 469 474 470 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 471 VBoxGlobal_LDFLAGS.darwin += -framework OpenGL 475 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 476 VBoxGlobal_LDFLAGS.darwin += -framework OpenGL 477 endif 472 478 endif 473 479 … … 528 534 529 535 530 # 531 # VirtualBox Virtual Machine Application 532 # Libraries. 533 # 534 535 # Library required for the hdd backend enumeration: 536 VirtualBoxRT_LIBS = $(LIB_DDU) 537 538 # Runtime library loader required on X11 hosts: 539 if1of ($(KBUILD_TARGET), linux netbsd openbsd) 540 VirtualBoxRT_LIBS += dl 541 endif 542 543 # Xinerama library required for multi-monitor support: 544 VirtualBoxRT_LIBS.linux += Xinerama 545 VirtualBoxRT_LIBS.solaris += Xinerama 546 VirtualBoxRT_LIBS.freebsd += Xinerama 547 548 # XCB library required for direct XCB native code support: 549 VirtualBoxRT_LIBS.linux += xcb 550 VirtualBoxRT_LIBS.solaris += xcb 551 VirtualBoxRT_LIBS.freebsd += xcb 552 553 # Various Windows hosts libraries: 554 VirtualBoxRT_LIBS.win = \ 536 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 537 # 538 # VirtualBox Virtual Machine Application 539 # Libraries. 540 # 541 542 # Library required for the hdd backend enumeration: 543 VirtualBoxRT_LIBS = $(LIB_DDU) 544 545 # Runtime library loader required on X11 hosts: 546 if1of ($(KBUILD_TARGET), linux netbsd openbsd) 547 VirtualBoxRT_LIBS += dl 548 endif 549 550 # Xinerama library required for multi-monitor support: 551 VirtualBoxRT_LIBS.linux += Xinerama 552 VirtualBoxRT_LIBS.solaris += Xinerama 553 VirtualBoxRT_LIBS.freebsd += Xinerama 554 555 # XCB library required for direct XCB native code support: 556 VirtualBoxRT_LIBS.linux += xcb 557 VirtualBoxRT_LIBS.solaris += xcb 558 VirtualBoxRT_LIBS.freebsd += xcb 559 560 # Various Windows hosts libraries: 561 VirtualBoxRT_LIBS.win = \ 555 562 $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \ 556 563 $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \ 557 564 $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib 558 565 559 # VBox keyboard shared library for X11 hosts:560 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)561 VirtualBoxRT_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)562 endif563 564 # These are 2D Video Acceleration and 3D Acceleration related libs:565 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)566 VirtualBoxRT_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib567 VirtualBoxRT_LIBS.solaris += GL568 VirtualBoxRT_LIBS.linux += GL569 VirtualBoxRT_LIBS.freebsd += GL570 endif571 ifdef VBOX_WITH_CROGL572 VirtualBoxRT_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)573 endif574 575 # This one is global shared GUI library:576 ifdef VBOX_GUI_WITH_SHARED_LIBRARY577 ifeq ($(KBUILD_TARGET),win)578 VirtualBoxRT_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)579 else580 VirtualBoxRT_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)581 endif582 endif583 584 585 #586 # VirtualBox - GUI Global Shared Library.587 # Libraries.588 #589 590 # Xinerama library required for multi-monitor support:591 VBoxGlobal_LIBS.linux += Xinerama592 VBoxGlobal_LIBS.solaris += Xinerama593 VBoxGlobal_LIBS.freebsd += Xinerama594 595 # Various Windows hosts libraries:596 VBoxGlobal_LIBS.win = \566 # VBox keyboard shared library for X11 hosts: 567 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) 568 VirtualBoxRT_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) 569 endif 570 571 # These are 2D Video Acceleration and 3D Acceleration related libs: 572 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 573 VirtualBoxRT_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib 574 VirtualBoxRT_LIBS.solaris += GL 575 VirtualBoxRT_LIBS.linux += GL 576 VirtualBoxRT_LIBS.freebsd += GL 577 endif 578 ifdef VBOX_WITH_CROGL 579 VirtualBoxRT_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB) 580 endif 581 582 # This one is global shared GUI library: 583 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 584 ifeq ($(KBUILD_TARGET),win) 585 VirtualBoxRT_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB) 586 else 587 VirtualBoxRT_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL) 588 endif 589 endif 590 591 592 # 593 # VirtualBox - GUI Global Shared Library. 594 # Libraries. 595 # 596 597 # Xinerama library required for multi-monitor support: 598 VBoxGlobal_LIBS.linux += Xinerama 599 VBoxGlobal_LIBS.solaris += Xinerama 600 VBoxGlobal_LIBS.freebsd += Xinerama 601 602 # Various Windows hosts libraries: 603 VBoxGlobal_LIBS.win = \ 597 604 $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib 598 605 599 # VBox keyboard shared library for X11 hosts: 600 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) 601 VBoxGlobal_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) 602 endif 603 604 # These are 2D Video Acceleration and 3D Acceleration related libs: 605 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 606 VBoxGlobal_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib 607 VBoxGlobal_LIBS.solaris += GL 608 VBoxGlobal_LIBS.linux += GL 609 VBoxGlobal_LIBS.freebsd += GL 610 endif 611 ifdef VBOX_WITH_CROGL 612 VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB) 613 endif 614 if defined(VBOX_WITH_VIDEOHWACCEL) 615 if1of ($(KBUILD_TARGET), win linux freebsd) 616 VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB) 606 # VBox keyboard shared library for X11 hosts: 607 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) 608 VBoxGlobal_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) 609 endif 610 611 # These are 2D Video Acceleration and 3D Acceleration related libs: 612 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 613 VBoxGlobal_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib 614 VBoxGlobal_LIBS.solaris += GL 615 VBoxGlobal_LIBS.linux += GL 616 VBoxGlobal_LIBS.freebsd += GL 617 endif 618 ifdef VBOX_WITH_CROGL 619 VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB) 620 endif 621 if defined(VBOX_WITH_VIDEOHWACCEL) 622 if1of ($(KBUILD_TARGET), win linux freebsd) 623 VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB) 624 endif 617 625 endif 618 626 endif … … 899 907 900 908 901 # 902 # VirtualBox Virtual Machine Application 903 # Headers containing definitions of classes that use the Q_OBJECT macro. 904 # 905 VirtualBoxRT_QT_MOCHDRS = \ 909 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 910 # 911 # VirtualBox Virtual Machine Application 912 # Headers containing definitions of classes that use the Q_OBJECT macro. 913 # 914 VirtualBoxRT_QT_MOCHDRS = \ 906 915 src/globals/UIStarter.h \ 907 916 src/runtime/UIConsoleEventHandler.h \ … … 953 962 src/wizards/firstrun/UIWizardFirstRunPageBasic.h 954 963 955 ifdef VBOX_WITH_DRAG_AND_DROP956 VirtualBoxRT_QT_MOCHDRS += \964 ifdef VBOX_WITH_DRAG_AND_DROP 965 VirtualBoxRT_QT_MOCHDRS += \ 957 966 src/runtime/UIDnDHandler.h 958 ifdef VBOX_WITH_DRAG_AND_DROP_GH959 VirtualBoxRT_QT_MOCHDRS += \967 ifdef VBOX_WITH_DRAG_AND_DROP_GH 968 VirtualBoxRT_QT_MOCHDRS += \ 960 969 src/runtime/UIDnDMIMEData.h 961 endif962 endif963 964 965 #966 # VirtualBox - GUI Global Shared Library.967 # Headers containing definitions of classes that use the Q_OBJECT macro.968 #969 VBoxGlobal_QT_MOCHDRS = \970 endif 971 endif 972 973 974 # 975 # VirtualBox - GUI Global Shared Library. 976 # Headers containing definitions of classes that use the Q_OBJECT macro. 977 # 978 VBoxGlobal_QT_MOCHDRS = \ 970 979 src/VBoxAboutDlg.h \ 971 980 src/VBoxLicenseViewer.h \ … … 1090 1099 src/wizards/newvd/UIWizardNewVDPageExpert.h 1091 1100 1092 ifdef VBOX_GUI_WITH_NETWORK_MANAGER1093 VBoxGlobal_QT_MOCHDRS += \1101 ifdef VBOX_GUI_WITH_NETWORK_MANAGER 1102 VBoxGlobal_QT_MOCHDRS += \ 1094 1103 src/net/UIDownloader.h \ 1095 1104 src/net/UIDownloaderAdditions.h \ … … 1106 1115 src/settings/global/UIGlobalSettingsProxy.h \ 1107 1116 src/settings/global/UIGlobalSettingsUpdate.h 1108 endif1109 1110 VBoxGlobal_QT_MOCHDRS.darwin += \1117 endif 1118 1119 VBoxGlobal_QT_MOCHDRS.darwin += \ 1111 1120 src/platform/darwin/UICocoaSpecialControls.h \ 1112 1121 src/platform/darwin/UIWindowMenuManager.h 1122 endif 1113 1123 1114 1124 … … 1185 1195 1186 1196 1187 # 1188 # VirtualBox Virtual Machine Application 1189 # Sources containing local definitions of classes that use the Q_OBJECT macro. 1190 # 1191 VirtualBoxRT_QT_MOCSRCS = \ 1197 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 1198 # 1199 # VirtualBox Virtual Machine Application 1200 # Sources containing local definitions of classes that use the Q_OBJECT macro. 1201 # 1202 VirtualBoxRT_QT_MOCSRCS = \ 1192 1203 src/runtime/UIConsoleEventHandler.cpp \ 1193 1204 src/runtime/UIFrameBuffer.cpp \ … … 1201 1212 1202 1213 1203 #1204 # VirtualBox - GUI Global Shared Library.1205 # Sources.1206 #1207 VBoxGlobal_QT_MOCSRCS = \1214 # 1215 # VirtualBox - GUI Global Shared Library. 1216 # Sources. 1217 # 1218 VBoxGlobal_QT_MOCSRCS = \ 1208 1219 src/extensions/QIAdvancedSlider.cpp \ 1209 1220 src/extensions/QIArrowSplitter.cpp \ … … 1232 1243 src/widgets/UIStatusBarEditorWindow.cpp 1233 1244 1234 ifdef VBOX_GUI_WITH_NETWORK_MANAGER1235 VBoxGlobal_QT_MOCSRCS += \1245 ifdef VBOX_GUI_WITH_NETWORK_MANAGER 1246 VBoxGlobal_QT_MOCSRCS += \ 1236 1247 src/net/UINetworkReply.cpp \ 1237 1248 src/net/UIUpdateManager.cpp 1238 endif1239 1240 ifdef VBOX_WITH_XPCOM1241 VBoxGlobal_QT_MOCSRCS += \1249 endif 1250 1251 ifdef VBOX_WITH_XPCOM 1252 VBoxGlobal_QT_MOCSRCS += \ 1242 1253 src/globals/COMDefs.cpp 1243 endif1244 1245 VBoxGlobal_QT_MOCSRCS.darwin += \1254 endif 1255 1256 VBoxGlobal_QT_MOCSRCS.darwin += \ 1246 1257 src/platform/darwin/UIWindowMenuManager.cpp 1247 1258 1248 VBoxGlobal_QT_MOCSRCS.linux += \1259 VBoxGlobal_QT_MOCSRCS.linux += \ 1249 1260 src/globals/UIDesktopWidgetWatchdog.cpp 1250 VBoxGlobal_QT_MOCSRCS.solaris += \1261 VBoxGlobal_QT_MOCSRCS.solaris += \ 1251 1262 src/globals/UIDesktopWidgetWatchdog.cpp 1252 VBoxGlobal_QT_MOCSRCS.freebsd += \1263 VBoxGlobal_QT_MOCSRCS.freebsd += \ 1253 1264 src/globals/UIDesktopWidgetWatchdog.cpp 1265 endif 1254 1266 1255 1267 … … 1594 1606 1595 1607 1596 # 1597 # VirtualBox Virtual Machine Application 1598 # Sources. 1599 # 1600 VirtualBoxRT_SOURCES = \ 1608 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 1609 # 1610 # VirtualBox Virtual Machine Application 1611 # Sources. 1612 # 1613 VirtualBoxRT_SOURCES = \ 1601 1614 src/main.cpp \ 1602 1615 src/globals/UIStarter.cpp \ … … 1649 1662 src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp 1650 1663 1651 ifdef VBOX_WITH_DRAG_AND_DROP1652 VirtualBoxRT_SOURCES += \1664 ifdef VBOX_WITH_DRAG_AND_DROP 1665 VirtualBoxRT_SOURCES += \ 1653 1666 src/runtime/UIDnDHandler.cpp 1654 ifdef VBOX_WITH_DRAG_AND_DROP_GH1655 VirtualBoxRT_SOURCES += \1667 ifdef VBOX_WITH_DRAG_AND_DROP_GH 1668 VirtualBoxRT_SOURCES += \ 1656 1669 src/runtime/UIDnDMIMEData.cpp 1657 VirtualBoxRT_SOURCES.win += \1670 VirtualBoxRT_SOURCES.win += \ 1658 1671 src/runtime/UIDnDDropSource_win.cpp \ 1659 1672 src/runtime/UIDnDDataObject_win.cpp \ 1660 1673 src/runtime/UIDnDEnumFormat_win.cpp 1661 endif1662 endif1663 1664 ifdef VBOX_WITH_ICHAT_THEATER1665 VirtualBoxRT_SOURCES.darwin += \1674 endif 1675 endif 1676 1677 ifdef VBOX_WITH_ICHAT_THEATER 1678 VirtualBoxRT_SOURCES.darwin += \ 1666 1679 src/platform/darwin/VBoxIChatTheaterWrapper.m 1667 endif1668 1669 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)1670 VirtualBoxRT_SOURCES += \1680 endif 1681 1682 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1683 VirtualBoxRT_SOURCES += \ 1671 1684 src/VBox2DHelpers.cpp \ 1672 1685 src/VBoxFBOverlay.cpp \ 1673 1686 src/VBoxGLSupportInfo.cpp 1674 endif1675 1676 VirtualBoxRT_SOURCES.darwin += \1687 endif 1688 1689 VirtualBoxRT_SOURCES.darwin += \ 1677 1690 src/platform/darwin/UIAbstractDockIconPreview.cpp \ 1678 1691 src/platform/darwin/UICocoaDockIconPreview.mm 1679 1692 1680 VirtualBoxRT_SOURCES.win += \1693 VirtualBoxRT_SOURCES.win += \ 1681 1694 src/platform/win/VirtualBox.rc 1682 1695 1683 1696 1684 #1685 # VirtualBox - GUI Global Shared Library.1686 # Sources.1687 #1688 VBoxGlobal_SOURCES = \1697 # 1698 # VirtualBox - GUI Global Shared Library. 1699 # Sources. 1700 # 1701 VBoxGlobal_SOURCES = \ 1689 1702 src/VBoxAboutDlg.cpp \ 1690 1703 src/VBoxLicenseViewer.cpp \ … … 1820 1833 src/wizards/newvd/UIWizardNewVDPageExpert.cpp 1821 1834 1822 ifdef VBOX_GUI_WITH_NETWORK_MANAGER1823 VBoxGlobal_SOURCES += \1835 ifdef VBOX_GUI_WITH_NETWORK_MANAGER 1836 VBoxGlobal_SOURCES += \ 1824 1837 src/net/UIDownloader.cpp \ 1825 1838 src/net/UIDownloaderAdditions.cpp \ … … 1837 1850 src/settings/global/UIGlobalSettingsProxy.cpp \ 1838 1851 src/settings/global/UIGlobalSettingsUpdate.cpp 1839 endif1840 1841 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X111842 VBoxGlobal_SOURCES += \1852 endif 1853 1854 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11 1855 VBoxGlobal_SOURCES += \ 1843 1856 src/platform/x11/VBoxX11Helper.cpp \ 1844 1857 src/platform/x11/XKeyboard-new.cpp 1845 endif1846 1847 VBoxGlobal_SOURCES.win += \1858 endif 1859 1860 VBoxGlobal_SOURCES.win += \ 1848 1861 src/platform/win/VBoxUtils-win.cpp \ 1849 1862 src/platform/win/WinKeyboard.cpp 1850 1863 1851 VBoxGlobal_SOURCES.darwin += \1864 VBoxGlobal_SOURCES.darwin += \ 1852 1865 src/platform/darwin/CocoaEventHelper.mm \ 1853 1866 src/platform/darwin/DarwinKeyboard.cpp \ … … 1858 1871 src/platform/darwin/VBoxUtils-darwin.cpp 1859 1872 1860 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)1861 VBoxGlobal_SOURCES += \1873 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1874 VBoxGlobal_SOURCES += \ 1862 1875 src/VBox2DHelpers.cpp 1876 endif 1863 1877 endif 1864 1878 … … 1898 1912 1899 1913 1900 # 1901 # VirtualBox Virtual Machine Application 1902 # The Qt modules we're using. 1903 # (The include directory and lib/framework for each module will be added by the Qt unit.) 1904 # 1905 VirtualBoxRT_QT_MODULES = Core Gui Widgets PrintSupport 1906 VirtualBoxRT_QT_MODULES.linux += X11Extras 1907 VirtualBoxRT_QT_MODULES.solaris += X11Extras 1908 VirtualBoxRT_QT_MODULES.freebsd += X11Extras 1909 VirtualBoxRT_QT_MODULES.darwin += MacExtras 1910 VirtualBoxRT_QT_MODULES.win += WinExtras 1911 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1912 VirtualBoxRT_QT_MODULES += OpenGL 1913 endif 1914 1915 1916 # 1917 # VirtualBox - GUI Global Shared Library. 1918 # The Qt modules we're using. 1919 # (The include directory and lib/framework for each module will be added by the Qt unit.) 1920 # 1921 VBoxGlobal_QT_MODULES = Core Gui Widgets 1922 VBoxGlobal_QT_MODULES.linux += X11Extras 1923 VBoxGlobal_QT_MODULES.solaris += X11Extras 1924 VBoxGlobal_QT_MODULES.freebsd += X11Extras 1925 VBoxGlobal_QT_MODULES.darwin += MacExtras 1926 VBoxGlobal_QT_MODULES.win += WinExtras 1927 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1928 VBoxGlobal_QT_MODULES += OpenGL 1914 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 1915 # 1916 # VirtualBox Virtual Machine Application 1917 # The Qt modules we're using. 1918 # (The include directory and lib/framework for each module will be added by the Qt unit.) 1919 # 1920 VirtualBoxRT_QT_MODULES = Core Gui Widgets PrintSupport 1921 VirtualBoxRT_QT_MODULES.linux += X11Extras 1922 VirtualBoxRT_QT_MODULES.solaris += X11Extras 1923 VirtualBoxRT_QT_MODULES.freebsd += X11Extras 1924 VirtualBoxRT_QT_MODULES.darwin += MacExtras 1925 VirtualBoxRT_QT_MODULES.win += WinExtras 1926 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1927 VirtualBoxRT_QT_MODULES += OpenGL 1928 endif 1929 1930 1931 # 1932 # VirtualBox - GUI Global Shared Library. 1933 # The Qt modules we're using. 1934 # (The include directory and lib/framework for each module will be added by the Qt unit.) 1935 # 1936 VBoxGlobal_QT_MODULES = Core Gui Widgets 1937 VBoxGlobal_QT_MODULES.linux += X11Extras 1938 VBoxGlobal_QT_MODULES.solaris += X11Extras 1939 VBoxGlobal_QT_MODULES.freebsd += X11Extras 1940 VBoxGlobal_QT_MODULES.darwin += MacExtras 1941 VBoxGlobal_QT_MODULES.win += WinExtras 1942 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1943 VBoxGlobal_QT_MODULES += OpenGL 1944 endif 1929 1945 endif 1930 1946 … … 1932 1948 # Pull in the ui files 1933 1949 $(eval VirtualBox_SOURCES += $(FORMS)) 1934 $(eval VirtualBoxRT_SOURCES += $(FORMS)) 1935 $(eval VBoxGlobal_SOURCES += $(FORMS)) 1950 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 1951 $(eval VirtualBoxRT_SOURCES += $(FORMS)) 1952 $(eval VBoxGlobal_SOURCES += $(FORMS)) 1953 endif 1936 1954 1937 1955 … … 1961 1979 1962 1980 1963 # Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down). 1964 VirtualBoxRT_SOURCES += VirtualBox1.qrc 1965 VirtualBox1.qrc_RCCFLAGS = -name BASIC1 1966 VirtualBoxRT_SOURCES += VirtualBox2.qrc 1967 VirtualBox2.qrc_RCCFLAGS = -name BASIC2 1968 VirtualBoxRT_SOURCES += VirtualBox1_x2.qrc 1969 VirtualBox1_x2.qrc_RCCFLAGS = -name BASIC1_X2 1970 VirtualBoxRT_SOURCES += VirtualBox2_x2.qrc 1971 VirtualBox2_x2.qrc_RCCFLAGS = -name BASIC2_X2 1972 VirtualBoxRT_SOURCES += VirtualBox1_x3.qrc 1973 VirtualBox1_x3.qrc_RCCFLAGS = -name BASIC1_X3 1974 VirtualBoxRT_SOURCES += VirtualBox2_x3.qrc 1975 VirtualBox2_x3.qrc_RCCFLAGS = -name BASIC2_X3 1976 VirtualBoxRT_SOURCES += VirtualBox1_x4.qrc 1977 VirtualBox1_x4.qrc_RCCFLAGS = -name BASIC1_X4 1978 VirtualBoxRT_SOURCES += VirtualBox2_x4.qrc 1979 VirtualBox2_x4.qrc_RCCFLAGS = -name BASIC2_X4 1980 VirtualBoxRT_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc 1981 $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND 1982 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 1983 VirtualBoxRT_SOURCES += VirtualBoxShaders.qrc 1984 VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS 1981 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 1982 # Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down). 1983 VirtualBoxRT_SOURCES += VirtualBox1.qrc 1984 VirtualBox1.qrc_RCCFLAGS = -name BASIC1 1985 VirtualBoxRT_SOURCES += VirtualBox2.qrc 1986 VirtualBox2.qrc_RCCFLAGS = -name BASIC2 1987 VirtualBoxRT_SOURCES += VirtualBox1_x2.qrc 1988 VirtualBox1_x2.qrc_RCCFLAGS = -name BASIC1_X2 1989 VirtualBoxRT_SOURCES += VirtualBox2_x2.qrc 1990 VirtualBox2_x2.qrc_RCCFLAGS = -name BASIC2_X2 1991 VirtualBoxRT_SOURCES += VirtualBox1_x3.qrc 1992 VirtualBox1_x3.qrc_RCCFLAGS = -name BASIC1_X3 1993 VirtualBoxRT_SOURCES += VirtualBox2_x3.qrc 1994 VirtualBox2_x3.qrc_RCCFLAGS = -name BASIC2_X3 1995 VirtualBoxRT_SOURCES += VirtualBox1_x4.qrc 1996 VirtualBox1_x4.qrc_RCCFLAGS = -name BASIC1_X4 1997 VirtualBoxRT_SOURCES += VirtualBox2_x4.qrc 1998 VirtualBox2_x4.qrc_RCCFLAGS = -name BASIC2_X4 1999 VirtualBoxRT_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc 2000 $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND 2001 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 2002 VirtualBoxRT_SOURCES += VirtualBoxShaders.qrc 2003 VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS 2004 endif 1985 2005 endif 1986 2006
Note:
See TracChangeset
for help on using the changeset viewer.
