Commit 1654e9d3 authored by John van Groningen's avatar John van Groningen
Browse files

support {Project} and {Application} in postlink

parent 02df0ce5
...@@ -201,7 +201,6 @@ where ...@@ -201,7 +201,6 @@ where
| importermn<>mn | importermn<>mn
= TryInsertImporter rest list = TryInsertImporter rest list
= list = list
//-- //--
...@@ -604,6 +603,9 @@ SetProject applicationDir projectDir ...@@ -604,6 +603,9 @@ SetProject applicationDir projectDir
// # project = PR_SetExpDLL pg_exportedDLL project // # project = PR_SetExpDLL pg_exportedDLL project
// default of used appopts in exe are ok isn't right :-( // default of used appopts in exe are ok isn't right :-(
# pg_static = FixStatic applicationDir projectDir pg_static # pg_static = FixStatic applicationDir projectDir pg_static
# pg_postlink = case pg_postlink of
Just post_link -> Just (ExpandPath applicationDir projectDir post_link)
Nothing -> Nothing
# project = {project & static_info = pg_static, dynamic_info = pg_dynamic} # project = {project & static_info = pg_static, dynamic_info = pg_dynamic}
# project = {project & prec = pg_precompile, posl = pg_postlink} # project = {project & prec = pg_precompile, posl = pg_postlink}
= project = project
...@@ -624,6 +626,9 @@ where ...@@ -624,6 +626,9 @@ where
GetProject :: !{#Char} !{#Char} !Project -> ProjectGlobalOptions GetProject :: !{#Char} !{#Char} !Project -> ProjectGlobalOptions
GetProject applicationDir projectDir project GetProject applicationDir projectDir project
# post_link = case project.posl of
Just post_link -> Just (SubstitutePath applicationDir projectDir post_link)
Nothing -> Nothing
= { pg_built = PR_Built project = { pg_built = PR_Built project
, pg_codegen = PR_GetCodeGenOptions project , pg_codegen = PR_GetCodeGenOptions project
, pg_application = PR_GetApplicationOptions project , pg_application = PR_GetApplicationOptions project
...@@ -637,7 +642,7 @@ GetProject applicationDir projectDir project ...@@ -637,7 +642,7 @@ GetProject applicationDir projectDir project
, pg_static = substitite_paths_in_static applicationDir projectDir project.static_info , pg_static = substitite_paths_in_static applicationDir projectDir project.static_info
, pg_dynamic = project.dynamic_info , pg_dynamic = project.dynamic_info
, pg_precompile = project.prec , pg_precompile = project.prec
, pg_postlink = project.posl , pg_postlink = post_link
} }
where where
exepath exepath
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment