Changeset 95259 in vbox
- Timestamp:
- Jun 13, 2022 3:32:38 PM (2 years ago)
- Location:
- trunk/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/solaris/Virtio/Makefile.kmk
r93115 r95259 38 38 virtionet_NAME.solaris = virtnet 39 39 virtionet_TEMPLATE = VBOXGUESTR0 40 virtionet_DEFS = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" 41 virtionet_DEPS += $(VBOX_SVN_REV_KMK) 40 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 41 virtionet_DEFS = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_VERSION_STRING="$(VBOX_VERSION_STRING)" 42 else 43 virtionet_DEFS = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" 44 endif 45 virtionet_DEPS = $(VBOX_SVN_REV_KMK) 42 46 virtionet_INCS := . 43 47 virtionet_SOURCES = \ -
trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
r94306 r95259 38 38 VBoxClient_TEMPLATE = NewVBoxGuestR3Exe 39 39 VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_WITH_HGCM 40 VBoxClient_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 40 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 41 VBoxClient_DEFS += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" 42 else 43 VBoxClient_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 44 endif 41 45 ifdef VBOX_WITH_DBUS 42 46 VBoxClient_DEFS += VBOX_WITH_DBUS … … 53 57 54 58 VBoxDRMClient_TEMPLATE = NewVBoxGuestR3Exe 55 VBoxDRMClient_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 59 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 60 VBoxDRMClient_DEFS += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" 61 else 62 VBoxDRMClient_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 63 endif 56 64 VBoxDRMClient_SOURCES = \ 57 65 display-drm.cpp \ … … 200 208 seamless.cpp \ 201 209 seamless-x11.cpp 202 tstSeamlessX11_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 210 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 211 tstSeamlessX11_DEFS += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" 212 else 213 tstSeamlessX11_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 214 endif 203 215 tstSeamlessX11_LIBPATH = \ 204 216 $(VBOX_LIBPATH_X11) -
trunk/src/VBox/Devices/PC/ipxe/Makefile.kmk
r93115 r95259 166 166 VERSION_MINOR=0 \ 167 167 VERSION_PATCH=0 \ 168 VERSION=\"1.0.0+\" \169 168 _build_id=0xaffeaffe 170 169 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 170 TEMPLATE_iPxe_DEFS += VERSION="1.0.0+" 171 else 172 TEMPLATE_iPxe_DEFS += VERSION=\"1.0.0+\" 173 endif 171 174 172 175 # -
trunk/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk
r93115 r95259 20 20 21 21 PROGRAMS += VBoxBalloonCtrl 22 VBoxBalloonCtrl_TEMPLATE = VBOXMAINCLIENTEXE 23 VBoxBalloonCtrl_DEFS += \ 24 VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 25 VBoxBalloonCtrl_DEFS.win = _WIN32_WINNT=0x0500 26 VBoxBalloonCtrl_SOURCES = \ 22 VBoxBalloonCtrl_TEMPLATE = VBOXMAINCLIENTEXE 23 VBoxBalloonCtrl_DEFS = VBOX_WATCHDOG_GLOBAL_PERFCOL 24 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 25 VBoxBalloonCtrl_DEFS += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" 26 else 27 VBoxBalloonCtrl_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 28 endif 29 VBoxBalloonCtrl_DEFS.win = _WIN32_WINNT=0x0500 30 VBoxBalloonCtrl_SOURCES = \ 27 31 VBoxWatchdog.cpp \ 28 32 VBoxWatchdogUtils.cpp \ 29 33 VBoxModAPIMonitor.cpp \ 30 34 VBoxModBallooning.cpp 31 35 VBoxBalloonCtrl_SOURCES.win = \ 32 36 VBoxBalloonCtrl.rc 33 37 -
trunk/src/VBox/Frontends/VBoxBugReport/Makefile.kmk
r93115 r95259 22 22 23 23 PROGRAMS += VBoxBugReport 24 VBoxBugReport_TEMPLATE = VBOXMAINCLIENTEXE 25 # VBoxBugReport_DEFS += \ 26 VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 27 VBoxBugReport_DEFS.win = _WIN32_WINNT=0x0501 PSAPI_VERSION=1 28 VBoxBugReport_LIBS.win = psapi.lib 29 VBoxBugReport_SOURCES = \ 24 VBoxBugReport_TEMPLATE = VBOXMAINCLIENTEXE 25 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 26 # VBoxBugReport_DEFS = VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" 27 else 28 # VBoxBugReport_DEFS = VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 29 endif 30 VBoxBugReport_DEFS.win = _WIN32_WINNT=0x0501 PSAPI_VERSION=1 31 VBoxBugReport_LIBS.win = psapi.lib 32 VBoxBugReport_SOURCES = \ 30 33 VBoxBugReport.cpp 31 34 VBoxBugReport_SOURCES.win = \ 32 35 VBoxBugReportWin.cpp 33 36 -
trunk/src/VBox/RDP/client-1.8.4/Makefile.kmk
r93115 r95259 34 34 rdesktop-vrdp_SDKS = VBOX_OPENSSL2 35 35 rdesktop-vrdp_DEFS = \ 36 PACKAGE_NAME=\"rdesktop-vrdp\" PACKAGE_TARNAME=\"rdesktop-vrdp\" PACKAGE_VERSION=\"1.8.4\" \37 PACKAGE_STRING=\"rdesktop\ 1.8.4\" PACKAGE_BUGREPORT=\"\" STDC_HEADERS=1 L_ENDIAN=1 \38 36 HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 \ 39 37 HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_SYS_SELECT_H=1 \ 40 38 HAVE_LOCALE_H=1 HAVE_LANGINFO_H=1 HAVE_ICONV_H=1 \ 41 EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \42 39 HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \ 43 40 HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \ 44 KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\"\41 HAVE_DIRENT_H=1 WITH_RDPSND=1 STDC_HEADERS=1 L_ENDIAN=1 \ 45 42 RDESKTOP=1 43 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 44 rdesktop-vrdp_DEFS += \ 45 PACKAGE_NAME="rdesktop-vrdp" PACKAGE_TARNAME="rdesktop-vrdp" PACKAGE_VERSION="1.8.4" \ 46 PACKAGE_STRING="rdesktop\ 1.8.4" PACKAGE_BUGREPORT="" \ 47 EGD_SOCKET="/var/run/egd-pool" \ 48 KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,"/opt/VirtualBox")"/rdesktop-vrdp-keymaps" 49 else 50 rdesktop-vrdp_DEFS += \ 51 PACKAGE_NAME=\"rdesktop-vrdp\" PACKAGE_TARNAME=\"rdesktop-vrdp\" PACKAGE_VERSION=\"1.8.4\" \ 52 PACKAGE_STRING=\"rdesktop\ 1.8.4\" PACKAGE_BUGREPORT=\"\" \ 53 EGD_SOCKET=\"/var/run/egd-pool\" \ 54 KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" 55 endif 46 56 ifdef WITH_BIRD_VD_HACKS 47 57 rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS -
trunk/src/VBox/ValidationKit/utils/usb/Makefile.kmk
r93115 r95259 39 39 PROGRAMS += UsbTestService 40 40 UsbTestService_TEMPLATE = VBoxValidationKitR3 41 UsbTestService_DEFS = \ 42 KBUILD_TARGET=\"$(KBUILD_TARGET)\" \ 43 KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\" 41 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 42 UsbTestService_DEFS = \ 43 KBUILD_TARGET="$(KBUILD_TARGET)" \ 44 KBUILD_TARGET_ARCH="$(KBUILD_TARGET_ARCH)" 45 else 46 UsbTestService_DEFS = \ 47 KBUILD_TARGET=\"$(KBUILD_TARGET)\" \ 48 KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\" 49 endif 44 50 UsbTestService_SOURCES = \ 45 51 UsbTestService.cpp \ -
trunk/src/libs/xpcom18a4/Config.kmk
r87254 r95259 68 68 NDEBUG=1 \ 69 69 _IMPL_NS_COM \ 70 XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \71 MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\" \72 70 IN_RING3 \ 73 71 VBOX_USE_IPRT_IN_XPCOM 72 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 73 TEMPLATE_XPCOM_DEFS += \ 74 XPCOM_DLL_BASE="$(basename $(notdir $(LIB_XPCOM)))" \ 75 MOZ_DLL_SUFFIX="$(suffix $(LIB_XPCOM))" 76 else 77 TEMPLATE_XPCOM_DEFS += \ 78 XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \ 79 MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\" 80 endif 81 74 82 ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 75 83 TEMPLATE_XPCOM_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 76 84 endif 77 85 TEMPLATE_XPCOM_DEFS.x86 = i386=1 78 TEMPLATE_XPCOM_DEFS.amd64 = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\) 79 TEMPLATE_XPCOM_DEFS.arm64 = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\) 80 TEMPLATE_XPCOM_DEFS.darwin = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBOXR3NP_DEFS.darwin) 86 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 87 TEMPLATE_XPCOM_DEFS.amd64 = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY(a,b)=__builtin_va_copy(a,b) 88 else 89 TEMPLATE_XPCOM_DEFS.amd64 = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\) 90 endif 91 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 92 TEMPLATE_XPCOM_DEFS.arm64 = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY(a,b)=__builtin_va_copy(a,b) 93 else 94 TEMPLATE_XPCOM_DEFS.arm64 = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\) 95 endif 96 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 97 TEMPLATE_XPCOM_DEFS.darwin = OSTYPE="Darwin8.8.1" OSARCH="Darwin" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBOXR3NP_DEFS.darwin) 98 else 99 TEMPLATE_XPCOM_DEFS.darwin = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBOXR3NP_DEFS.darwin) 100 endif 81 101 TEMPLATE_XPCOM_DEFS.darwin.amd64 = VBOX_MACOSX_FOLLOWS_UNIX_IO 82 102 TEMPLATE_XPCOM_DEFS.darwin.arm64 = VBOX_MACOSX_FOLLOWS_UNIX_IO 83 TEMPLATE_XPCOM_DEFS.freebsd = OSTYPE=\"FreeBSD5+\" OSARCH=\"FreeBSD\" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1 84 TEMPLATE_XPCOM_DEFS.linux = OSTYPE=\"Linux2.6\" OSARCH=\"Linux\" XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1 103 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 104 TEMPLATE_XPCOM_DEFS.freebsd = OSTYPE="FreeBSD5+" OSARCH="FreeBSD" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1 105 else 106 TEMPLATE_XPCOM_DEFS.freebsd = OSTYPE=\"FreeBSD5+\" OSARCH=\"FreeBSD\" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1 107 endif 108 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 109 TEMPLATE_XPCOM_DEFS.linux = OSTYPE="Linux2.6" OSARCH="Linux" XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1 110 else 111 TEMPLATE_XPCOM_DEFS.linux = OSTYPE=\"Linux2.6\" OSARCH=\"Linux\" XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1 112 endif 85 113 # Don't define BSD_SELECT because bsdselect() from kLIBC <= 0.6.3 has problems on SMP 86 TEMPLATE_XPCOM_DEFS.os2 = OSTYPE=\"OS/2_4.5\" OSARCH=\"OS/2\" XP_OS2 XP_PC OS2=4 87 TEMPLATE_XPCOM_DEFS.solaris = OSTYPE=\"Solaris10\" OSARCH=\"Solaris\" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT 114 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 115 TEMPLATE_XPCOM_DEFS.os2 = OSTYPE="OS/2_4.5" OSARCH="OS/2" XP_OS2 XP_PC OS2=4 116 else 117 TEMPLATE_XPCOM_DEFS.os2 = OSTYPE=\"OS/2_4.5\" OSARCH=\"OS/2\" XP_OS2 XP_PC OS2=4 118 endif 119 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 120 TEMPLATE_XPCOM_DEFS.solaris = OSTYPE="Solaris10" OSARCH="Solaris" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT 121 else 122 TEMPLATE_XPCOM_DEFS.solaris = OSTYPE=\"Solaris10\" OSARCH=\"Solaris\" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT 123 endif 88 124 TEMPLATE_XPCOM_LDFLAGS = $(TEMPLATE_VBOXR3NP_LDFLAGS) 89 125 ifdef VBOX_WITH_RUNPATH -
trunk/src/libs/xpcom18a4/Makefile.kmk
r88126 r95259 776 776 VBox-xpcom-io_TEMPLATE = XPCOM 777 777 VBox-xpcom-io_INSTTYPE = none 778 VBox-xpcom-io_DEFS = _IMPL_NS_COM MOZ_USER_DIR=\".mozilla\" 778 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 779 VBox-xpcom-io_DEFS = _IMPL_NS_COM MOZ_USER_DIR=".mozilla" 780 else 781 VBox-xpcom-io_DEFS = _IMPL_NS_COM MOZ_USER_DIR=\".mozilla\" 782 endif 779 783 if defined(VBOX_WITH_HARDENING) && defined(VBOX_PATH_APP_PRIVATE_ARCH) 780 VBox-xpcom-io_DEFS += MOZ_DEFAULT_VBOX_XPCOM_HOME=\"$(VBOX_PATH_APP_PRIVATE_ARCH)\" 784 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 785 VBox-xpcom-io_DEFS += MOZ_DEFAULT_VBOX_XPCOM_HOME="$(VBOX_PATH_APP_PRIVATE_ARCH)" 786 else 787 VBox-xpcom-io_DEFS += MOZ_DEFAULT_VBOX_XPCOM_HOME=\"$(VBOX_PATH_APP_PRIVATE_ARCH)\" 788 endif 781 789 endif 782 790 VBox-xpcom-io_INCS.darwin = \ … … 957 965 VBoxXPCOM_TEMPLATE = XPCOM 958 966 VBoxXPCOM_NAME = $(basename $(notdir $(LIB_XPCOM))) 959 VBoxXPCOM_DEFS = BUILD_DCONNECT= "1"_IMPL_NS_COM967 VBoxXPCOM_DEFS = BUILD_DCONNECT=1 _IMPL_NS_COM 960 968 ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 961 969 VBoxXPCOM_LDFLAGS.linux = -Wl,--version-script=$(XPCOM_C_NAMESPACE_MAP) … … 1100 1108 TEMPLATE_XPCOMIPC = XPCOM IPC libraries 1101 1109 TEMPLATE_XPCOMIPC_EXTENDS = XPCOM 1102 TEMPLATE_XPCOMIPC_DEFS = \ 1103 $(TEMPLATE_XPCOM_DEFS) BUILD_DCONNECT="1" \ 1104 IPC_DAEMON_APP_NAME=\"VBoxXPCOMIPCD$(SUFF_EXE)\" 1110 TEMPLATE_XPCOMIPC_DEFS = $(TEMPLATE_XPCOM_DEFS) BUILD_DCONNECT=1 1111 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 1112 TEMPLATE_XPCOMIPC_DEFS += IPC_DAEMON_APP_NAME="VBoxXPCOMIPCD$(SUFF_EXE)" 1113 else 1114 TEMPLATE_XPCOMIPC_DEFS += IPC_DAEMON_APP_NAME=\"VBoxXPCOMIPCD$(SUFF_EXE)\" 1115 endif 1105 1116 ifdef IPC_LOGGING 1106 1117 TEMPLATE_XPCOMIPC_DEFS += IPC_LOGGING … … 1134 1145 TEMPLATE_XPCOMIPCEXE = XPCOM IPC executables 1135 1146 TEMPLATE_XPCOMIPCEXE_EXTENDS = XPCOMEXE 1136 TEMPLATE_XPCOMIPCEXE_DEFS = $(TEMPLATE_XPCOMEXE_DEFS) BUILD_DCONNECT= "1"1147 TEMPLATE_XPCOMIPCEXE_DEFS = $(TEMPLATE_XPCOMEXE_DEFS) BUILD_DCONNECT=1 1137 1148 ifdef IPC_LOGGING 1138 1149 TEMPLATE_XPCOMIPCEXE_DEFS += IPC_LOGGING
Note:
See TracChangeset
for help on using the changeset viewer.