summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-03-18 12:43:32 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-03-18 12:43:32 +0000
commit05a2e564f32d413e63834c9261fd0bd37c68b479 (patch)
tree1690d257a9bd245637ced1f074e1596a8ed10894 /desktop
parent0f1dd0dc5718f26deb5fb92dcb3a7722b7a72b0e (diff)
INTEGRATION: CWS sb83 (1.46.8); FILE MERGED
2008/03/18 08:12:52 sb 1.46.8.9: merge conflict 2008/02/22 11:10:42 sb 1.46.8.8: RESYNC: (1.48-1.49); FILE MERGED 2008/02/01 13:29:20 sb 1.46.8.7: RESYNC: (1.47-1.48); FILE MERGED 2008/01/31 17:00:15 is 1.46.8.6: #i85112# new basis link 2008/01/29 14:45:22 sb 1.46.8.5: #i84200# cuiloader was not used at all 2008/01/09 10:52:48 sb 1.46.8.4: RESYNC: (1.46-1.47); FILE MERGED 2007/12/27 12:28:09 sb 1.46.8.3: #i84200# The version number in basis-link needs to be abstracted over. 2007/12/21 14:56:35 sb 1.46.8.2: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop; moved everything relevant from module sal there) (but needed on all Windows platforms). 2007/12/10 14:42:05 sb 1.46.8.1: #i84309# Completely removed deprecated pkgchk tool.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/prj/build.lst10
1 files changed, 4 insertions, 6 deletions
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 386ab36dc189..d2b5b4b7469a 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -3,8 +3,8 @@ dt desktop usr1 - all dt_mkout NULL
dt desktop\inc nmake - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
dt desktop\res get - all dt_res NULL
-dt desktop\source\app nmake - all dt_app dt_inc NULL
-dt desktop\source\migration nmake - all dt_migr dt_app dt_inc NULL
+dt desktop\source\app nmake - all dt_app dt_migr dt_inc NULL
+dt desktop\source\migration nmake - all dt_migr dt_inc NULL
dt desktop\source\migration\services nmake - all dt_services dt_inc NULL
dt desktop\source\so_comp nmake - all dt_so_comp dt_inc NULL
dt desktop\source\offacc nmake - all dt_offac dt_inc NULL
@@ -12,15 +12,13 @@ dt desktop\source\splash nmake - all dt_spl dt_migr dt_inc NULL
dt desktop\win32\source nmake - w dt_wrapper dt_inc NULL
dt desktop\win32\source\setup nmake - w dt_setup dt_inc NULL
dt desktop\win32\source\officeloader nmake - w dt_officeloader dt_inc NULL
-dt desktop\win32\source\cuiloader nmake - w dt_cuiloader dt_wrapper.w dt_inc NULL
-dt desktop\win32\source\guiloader nmake - w dt_guiloader dt_cuiloader.w dt_wrapper.w dt_inc NULL
+dt desktop\win32\source\guiloader nmake - w dt_guiloader dt_wrapper.w dt_inc NULL
+dt desktop\win32\source\guistdio nmake - w dt_guistdio dt_inc NULL
dt desktop\win32\source\applauncher nmake - w dt_applauncher dt_inc NULL
dt desktop\win32\source\applauncher\ooo nmake - w dt_applauncher_ooo dt_applauncher.w dt_inc NULL
dt desktop\os2\source\applauncher nmake - p dt_applauncher dt_inc NULL
dt desktop\source\pagein nmake - u dt_pagein dt_inc NULL
dt desktop\source\pkgchk\unopkg nmake - all dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
-dt desktop\source\pkgchk nmake - all dt_pkgchk NULL
-dt desktop\source\pkgchk\msi nmake - w dt_pkgchk_msi dt_pkgchk NULL
dt desktop\source\deployment nmake - all dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc NULL
dt desktop\source\deployment\misc nmake - all dt_dp_misc dt_inc NULL
dt desktop\source\deployment\unopkg nmake - all dt_dp_unopkg dt_inc NULL