We are planning to upgrade GitLab to the latest version this Friday morning. Expect some downtime!

Commit 787ea9c9 authored by Diederik van Arkel's avatar Diederik van Arkel

Support carb resource

parent 3a153dc9
......@@ -278,6 +278,7 @@ LinkOptionsTable =
, SimpleOption "ResourceSource" (\a->a.resource_source) (\v a->{a & resource_source = v})
, SimpleOption "GenerateDLL" (\a->a.generate_dll) (\v a->{a & generate_dll = v})
, SimpleOption "ExportedNames" (\a->a.dll_export_list_name) (\v a->{a & dll_export_list_name = v})
, SimpleOption "AddCarbResource" (\a->a.add_carb_resource) (\v a->{a & add_carb_resource = v})
}
EditWdOptionsTable :: OptionsTable EditWdOptions
......
......@@ -336,7 +336,8 @@ eqLinkOpts lo1 lo2 =
EQStrings (SortStrings lo1.extraObjectModules) (SortStrings lo2.extraObjectModules) &&
EQStrings (SortStrings lo1.libraries) (SortStrings lo2.libraries) &&
lo1.generate_dll == lo2.generate_dll &&
lo1.dll_export_list_name == lo2.dll_export_list_name
lo1.dll_export_list_name == lo2.dll_export_list_name &&
lo1.add_carb_resource == lo2.add_carb_resource
PR_SetLinkOptions :: !Project !LinkOptions -> Project;
......
......@@ -30,6 +30,8 @@ instance fromString Processor
, generate_dll :: !Bool
, dll_export_list_name :: !String
, add_carb_resource :: !Bool // Mac-only!
}
DefaultLinkOptions :: LinkOptions
......
......@@ -109,8 +109,10 @@ where
, generate_dll :: !Bool
, dll_export_list_name :: !String
, add_carb_resource :: !Bool // Mac-only!
}
/*
instance == LinkOptions // do we need to check resource linking flags???
where
(==) :: !LinkOptions !LinkOptions -> Bool
......@@ -122,8 +124,9 @@ where
lo1.link_resources == lo2.link_resources &&
(if lo1.link_resources (lo1.resource_source == lo2.resource_source) True) &&
EQStrings (SortStrings lo1.extraObjectModules) (SortStrings lo2.extraObjectModules) &&
EQStrings (SortStrings lo1.libraries) (SortStrings lo2.libraries)
EQStrings (SortStrings lo1.libraries) (SortStrings lo2.libraries) &&
lo1.add_carb_resource == lo2.add_carb_resource
*/
DefaultLinkOptions :: LinkOptions;
DefaultLinkOptions =
{ extraObjectModules = Nil
......@@ -136,6 +139,7 @@ DefaultLinkOptions =
, generate_dll = False
, dll_export_list_name = ""
, add_carb_resource = False // Clean2 ide targets Carbon?!
}
:: LinkMethod
......
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