Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
clean-and-itasks
clean-ide
Commits
740deda9
Commit
740deda9
authored
Jun 20, 2006
by
John van Groningen
Browse files
append obj for 64 bit windows for "import code from " ending with a dot
(o for 32 bit windows)
parent
7f0e5769
Changes
1
Hide whitespace changes
Inline
Side-by-side
Pm/PmDriver.icl
View file @
740deda9
...
...
@@ -834,14 +834,10 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
#
ofiles
=
Reverse2
clmodpaths
ofiles
#
(
use_64_bit_processor
,
ps
)
=
getCurrent64BitProcessor
ps
// module imported objects and dynamic libs
#
abcLinkInfo
=
PR_GetABCLinkInfo
project
#
linkObjFileNames
=
Map
fix
abcLinkInfo
.
linkObjFileNames
with
fix
s
|
s
.[
size
s
-
1
]
==
'.'
=
MakeObjPathname
tp
s
=
s
#
linkObjFileNames
=
Map
(
append_object_file_extension_if_dot_at_end
tp
use_64_bit_processor
)
abcLinkInfo
.
linkObjFileNames
#
(
objPathsOk
,
ofiles
,
abcPathsCache
)
=
GetPathNames
linkObjFileNames
ofiles
abcPathsCache
#
(_,
ofiles`
,
abcPathsCache
)
=
GetPathNames
/*abcLinkInfo.*/
linkObjFileNames
ofiles`
abcPathsCache
...
...
@@ -866,12 +862,7 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
#
loobjsOk
=
True
#
lolibsOk
=
True
#
extraObjectModules
=
lo
.
extraObjectModules
#
extraObjectModules
=
Map
fix
extraObjectModules
with
fix
s
|
s
.[
size
s
-
1
]
==
'.'
=
MakeObjPathname
tp
s
=
s
#
extraObjectModules
=
Map
(
append_object_file_extension_if_dot_at_end
tp
use_64_bit_processor
)
extraObjectModules
#
ofiles
=
Concat
extraObjectModules
ofiles
#
ofiles`
=
Concat
extraObjectModules
ofiles`
#
lfiles
=
Concat
lo
.
libraries
lfiles
...
...
@@ -931,7 +922,6 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
#
optionspath
=
MakeOptionsName
prj_path
tp
#
(
dynlstr
,
ps
)
=
getCurrentDynl
ps
#
(
use_64_bit_processor
,
ps
)
=
getCurrent64BitProcessor
ps
#
(
ps
,
ok
)
=
Link
linkstr
updateErrorWindow
execpath
ao
optionspath
lfiles
ofiles
sfiles
(
lo
.
method
==
LM_Static
)
...
...
@@ -964,6 +954,13 @@ icl_to_dcl_file_name file_name
=
file_name
:=
(
s
-3
,
'd'
);
=
file_name
;
append_object_file_extension_if_dot_at_end
tp
use_64_bit_processor
s
|
s
.[
size
s
-
1
]
==
'.'
|
use_64_bit_processor
=
s
+++
"obj"
=
MakeObjPathname
tp
s
=
s
//-- Compile Phase...
::
UnknownFinishedProcessors
=
NoUnknownFinishedProcessors
|
UnknownFinishedProcessors
!
Int
![
Int
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment