← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtualbox/quantal

« back to all changes in this revision

Viewing changes to src/VBox/Main/Makefile.kmk

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-05-29 10:09:31 UTC
  • mfrom: (3.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120529100931-2xayrbh5hyzm6e9p
Tags: 4.1.16-dfsg-1
* New upstream release.
* Drop 37-fix-build-gcc47.patch, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/Makefile.kmk
382
382
 #       needing it.
383
383
 src-server/win/NetIf-win.cpp_INCS.win += $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
384
384
 VBoxSVC_LIBS.win += \
385
 
        $(WinNetConfig_1_TARGET) \
386
 
        $(VBoxDrvCfg_1_TARGET) \
 
385
        $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
 
386
        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
387
387
        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
388
388
        $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
389
389
endif
390
390
VBoxSVC_LDFLAGS.darwin    = -framework IOKit -framework SystemConfiguration
391
391
 
392
392
ifdef VBOX_WITH_CROGL
393
 
 VBoxSVC_LIBS += $(VBoxOGLTest_1_TARGET)
 
393
 VBoxSVC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
394
394
 VBoxSVC_LDFLAGS.darwin += -framework OpenGL
395
395
endif
396
396
 
573
573
 
574
574
ifdef VBOX_WITH_NETFLT
575
575
 VBoxC_LIBS.win += \
576
 
        $(VBoxDrvCfg_1_TARGET) \
577
 
        $(WinNetConfig_1_TARGET) \
 
576
        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
 
577
        $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
578
578
        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
579
579
        $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
580
580
endif
581
581
 
582
582
ifdef VBOX_WITH_CROGL
583
 
 VBoxC_LIBS += $(VBoxOGLTest_1_TARGET)
 
583
 VBoxC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
584
584
 VBoxC_LDFLAGS.darwin += -framework OpenGL
585
585
endif
586
586