Changeset 52211 in vbox
- Timestamp:
- Jul 28, 2014 3:18:56 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 95274
- Location:
- trunk
- Files:
-
- 2 edited
-
Config.kmk (modified) (3 diffs)
-
src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r52210 r52211 5264 5264 TEMPLATE_VBOXGUESTR3LIB_EXTENDS = VBOXGUESTR3EXE 5265 5265 TEMPLATE_VBOXGUESTR3LIB_INST = $(INST_ADDITIONS_LIB) 5266 if1of ($(KBUILD_TARGET), solaris) ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack.5267 TEMPLATE_VBOXGUESTR3LIB_DEFS = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC5268 TEMPLATE_VBOXGUESTR3LIB_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC5269 TEMPLATE_VBOXGUESTR3LIB_CXXFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fPIC -fno-exceptions5270 endif5271 5266 5272 5267 # … … 5314 5309 TEMPLATE_VBOXGUESTR3NPLIB_EXTENDS = VBOXGUESTR3NPEXE 5315 5310 TEMPLATE_VBOXGUESTR3NPLIB_INST = $(INST_ADDITIONS_LIB) 5316 ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack.5317 ifeq ($(filter-out solaris.x86 %.amd64 %.sparc32 %.sparc64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) ## TODO: Remove these checks!5318 ifn1of ($(KBUILD_TARGET), darwin os2 win)5319 TEMPLATE_VBOXGUESTR3NPLIB_DEFS = $(TEMPLATE_VBOXGUESTR3NPEXE_DEFS) PIC5320 TEMPLATE_VBOXGUESTR3NPLIB_CFLAGS = $(TEMPLATE_VBOXGUESTR3NPEXE_CFLAGS) -fPIC5321 TEMPLATE_VBOXGUESTR3NPLIB_CXXFLAGS = $(TEMPLATE_VBOXGUESTR3NPEXE_CXXFLAGS) -fPIC -fno-exceptions5322 endif5323 endif5324 5311 5325 5312 … … 5512 5499 # 5513 5500 VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) 5514 VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB)5515 5501 VBOX_LIB_IPRT_GUEST_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared$(VBOX_SUFF_LIB) 5516 5502 VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB) -
trunk/src/VBox/Runtime/Makefile.kmk
r52050 r52211 32 32 # Only build the additions, sort out the legacy names first. 33 33 # 34 LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared RuntimeGuestR3Mini34 LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared 35 35 LIBRARIES.win.amd64 += RuntimeGuestR3-x86 RuntimeGuestR3Shared-x86 36 36 ifdef VBOX_WITH_ADDITION_DRIVERS … … 87 87 endif 88 88 ifdef VBOX_WITH_ADDITIONS 89 LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared RuntimeGuestR3Mini89 LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared 90 90 LIBRARIES.win.amd64 += RuntimeGuestR3-x86 RuntimeGuestR3Shared-x86 91 91 ifdef VBOX_WITH_ADDITION_DRIVERS … … 1257 1257 1258 1258 # 1259 # RuntimeGuestR3Mini - Minimal Guest Additions Runtime which does not require1260 # initialization and can be linked into an .so. Intended1261 # for X11 drivers, GRADD and similar.1262 #1263 RuntimeGuestR3Mini_TEMPLATE := VBoxGuestR3Dll1264 ## @todo change this to EXTEND the RuntimeGuestR3 target.1265 RuntimeGuestR3Mini_INST := $(INST_ADDITIONS_LIB)1266 RuntimeGuestR3Mini_SDKS.win := $(RuntimeR3_SDKS.win)1267 RuntimeGuestR3Mini_DEFS := \1268 $(filter-out RTCRITSECT_STRICT RT_NO_GIP RT_WITH_ICONV_CACHE, $(RuntimeR3_DEFS)) \1269 RT_MINI IN_RT_STATIC RTMEM_NO_WRAP_TO_EF_APIS1270 RuntimeGuestR3Mini_DEFS.$(KBUILD_TARGET) := $(RuntimeR3_DEFS.$(KBUILD_TARGET))1271 RuntimeGuestR3Mini_DEFS.$(KBUILD_HOST) := $(RuntimeR3_DEFS.$(KBUILD_HOST))1272 RuntimeGuestR3Mini_INCS := $(RuntimeR3_INCS)1273 RuntimeGuestR3Mini_INCS.$(KBUILD_TARGET) := $(RuntimeR3_INCS.$(KBUILD_TARGET))1274 RuntimeGuestR3Mini_INCS.$(KBUILD_HOST) := $(RuntimeR3_INCS.$(KBUILD_HOST))1275 RuntimeGuestR3Mini_SOURCES = \1276 common/alloc/alloc.cpp \1277 common/err/errmsg.cpp \1278 common/err/RTErrConvertFromErrno.cpp \1279 common/log/logformat.cpp \1280 common/misc/RTAssertMsg1Weak.cpp \1281 common/misc/RTAssertMsg2.cpp \1282 common/misc/RTAssertMsg2Add.cpp \1283 common/misc/RTAssertMsg2AddWeak.cpp \1284 common/misc/RTAssertMsg2AddWeakV.cpp \1285 common/misc/RTAssertMsg2Weak.cpp \1286 common/misc/RTAssertMsg2WeakV.cpp \1287 common/misc/assert.cpp \1288 common/misc/buildconfig.cpp \1289 common/misc/sanity-c.c \1290 common/misc/sanity-cpp.cpp \1291 common/misc/sg.cpp \1292 common/path/rtPathVolumeSpecLen.cpp \1293 common/path/RTPathAbsDup.cpp \1294 common/path/RTPathAbsEx.cpp \1295 common/path/RTPathAbsExDup.cpp \1296 common/path/RTPathAppend.cpp \1297 common/path/RTPathAppendEx.cpp \1298 common/path/RTPathExt.cpp \1299 common/path/RTPathFilename.cpp \1300 common/path/RTPathHasExt.cpp \1301 common/path/RTPathHasPath.cpp \1302 common/path/RTPathJoin.cpp \1303 common/path/RTPathJoinA.cpp \1304 common/path/RTPathParseSimple.cpp \1305 common/path/RTPathRealDup.cpp \1306 common/path/RTPathStripExt.cpp \1307 common/path/RTPathStripFilename.cpp \1308 common/path/RTPathStripTrailingSlash.cpp \1309 common/string/RTStrCat.cpp \1310 common/string/RTStrCatEx.cpp \1311 common/string/RTStrCatP.cpp \1312 common/string/RTStrCatPEx.cpp \1313 common/string/RTStrCmp.cpp \1314 common/string/RTStrCopy.cpp \1315 common/string/RTStrCopyEx.cpp \1316 common/string/RTStrCopyP.cpp \1317 common/string/RTStrCopyPEx.cpp \1318 common/string/RTStrNCmp.cpp \1319 common/string/RTStrNLen.cpp \1320 common/string/RTStrNLenEx.cpp \1321 common/string/RTStrStr.cpp \1322 common/string/straprintf.cpp \1323 common/string/strformat.cpp \1324 common/string/strformatnum.cpp \1325 common/string/strformatrt.cpp \1326 common/string/strformattype.cpp \1327 common/string/stringalloc.cpp \1328 common/string/strprintf.cpp \1329 common/string/strtonum.cpp \1330 common/string/unidata-flags.cpp \1331 common/string/unidata-lower.cpp \1332 common/string/unidata-upper.cpp \1333 common/string/utf-8.cpp \1334 common/string/utf-8-case.cpp \1335 common/string/utf-8-case2.cpp \1336 common/string/utf-16.cpp \1337 common/string/utf-16-case.cpp \1338 common/string/utf-16-latin-1.cpp \1339 common/table/avlpv.cpp \1340 generic/critsect-generic.cpp \1341 generic/pathhost-generic.cpp \1342 generic/RTAssertShouldPanic-generic.cpp \1343 generic/errvars-generic.cpp \1344 r3/alloc.cpp \1345 r3/alloc-ef.cpp \1346 r3/fileio.cpp \1347 r3/fs.cpp1348 RuntimeGuestR3Mini_SOURCES.freebsd = \1349 r3/posix/RTMemProtect-posix.cpp \1350 r3/posix/rtmempage-exec-mmap-posix.cpp \1351 r3/posix/RTPathUserHome-posix.cpp \1352 r3/posix/env-posix.cpp \1353 r3/posix/fileio-posix.cpp \1354 r3/posix/fileio2-posix.cpp \1355 r3/posix/path-posix.cpp \1356 r3/posix/path2-posix.cpp \1357 r3/posix/utf8-posix.cpp \1358 r3/posix/thread2-posix.cpp \1359 common/err/errmsgxpcom.cpp1360 RuntimeGuestR3Mini_SOURCES.linux = \1361 r3/posix/RTMemProtect-posix.cpp \1362 r3/posix/rtmempage-exec-mmap-posix.cpp \1363 r3/posix/RTPathUserHome-posix.cpp \1364 r3/posix/env-posix.cpp \1365 r3/posix/fileio-posix.cpp \1366 r3/posix/fileio2-posix.cpp \1367 r3/posix/path-posix.cpp \1368 r3/posix/path2-posix.cpp \1369 r3/posix/utf8-posix.cpp \1370 r3/posix/thread2-posix.cpp \1371 common/err/errmsgxpcom.cpp1372 RuntimeGuestR3Mini_SOURCES.solaris = \1373 r3/posix/RTMemProtect-posix.cpp \1374 r3/posix/rtmempage-exec-mmap-posix.cpp \1375 r3/posix/RTPathUserHome-posix.cpp \1376 r3/posix/env-posix.cpp \1377 r3/posix/fileio-posix.cpp \1378 r3/posix/fileio2-posix.cpp \1379 r3/posix/path-posix.cpp \1380 r3/posix/path2-posix.cpp \1381 r3/posix/utf8-posix.cpp \1382 r3/posix/thread2-posix.cpp \1383 common/err/errmsgxpcom.cpp1384 RuntimeGuestR3Mini_SOURCES.win = \1385 r3/win/alloc-win.cpp \1386 r3/win/fileio-win.cpp \1387 r3/win/path-win.cpp \1388 r3/win/utf8-win.cpp \1389 r3/win/thread2-win.cpp \1390 win/errmsgwin.cpp \1391 win/RTErrConvertFromWin32.cpp1392 1393 # VBox specific stuff.1394 RuntimeGuestR3Mini_SOURCES += \1395 VBox/logbackdoor.cpp \1396 VBox/logbackdoor-redirect.cpp1397 1398 1399 #1400 1259 # VBoxRT - Shared Object / DLL version. 1401 1260 #
Note:
See TracChangeset
for help on using the changeset viewer.
