Commit 8dfd23ed authored by Diederik van Arkel's avatar Diederik van Arkel

Remove 'add_carb' option;

parent 94a3d69a
...@@ -329,8 +329,8 @@ where ...@@ -329,8 +329,8 @@ where
, ("Include Resource Section" ,Nothing,toMark lo.link_resources,noPS (\ls->{ls & lo = {ls.lo & link_resources = not ls.lo.link_resources}})) , ("Include Resource Section" ,Nothing,toMark lo.link_resources,noPS (\ls->{ls & lo = {ls.lo & link_resources = not ls.lo.link_resources}}))
] ]
// macOnly // macOnly
[ ("Add 'carb' Resource" ,Nothing,toMark lo.add_carb_resource,noPS (\ls -> {ls & lo.add_carb_resource = not ls.lo.add_carb_resource})) // [ ("Add 'carb' Resource" ,Nothing,toMark lo.add_carb_resource,noPS (\ls -> {ls & lo.add_carb_resource = not ls.lo.add_carb_resource}))
] []
] (Columns 1) ] (Columns 1)
[ ControlPos (Left,zero) [ ControlPos (Left,zero)
] ]
......
...@@ -278,7 +278,7 @@ LinkOptionsTable = ...@@ -278,7 +278,7 @@ LinkOptionsTable =
, SimpleOption "ResourceSource" (\a->a.resource_source) (\v a->{a & resource_source = v}) , 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 "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 "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}) // , SimpleOption "AddCarbResource" (\a->a.add_carb_resource) (\v a->{a & add_carb_resource = v})
} }
EditWdOptionsTable :: OptionsTable EditWdOptions EditWdOptionsTable :: OptionsTable EditWdOptions
......
...@@ -337,8 +337,7 @@ eqLinkOpts lo1 lo2 = ...@@ -337,8 +337,7 @@ eqLinkOpts lo1 lo2 =
EQStrings (SortStrings lo1.extraObjectModules) (SortStrings lo2.extraObjectModules) && EQStrings (SortStrings lo1.extraObjectModules) (SortStrings lo2.extraObjectModules) &&
EQStrings (SortStrings lo1.libraries) (SortStrings lo2.libraries) && EQStrings (SortStrings lo1.libraries) (SortStrings lo2.libraries) &&
lo1.generate_dll == lo2.generate_dll && 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; PR_SetLinkOptions :: !Project !LinkOptions -> Project;
...@@ -771,7 +770,10 @@ PR_GetTarget :: !Project -> String ...@@ -771,7 +770,10 @@ PR_GetTarget :: !Project -> String
PR_GetTarget {Project | target} = target PR_GetTarget {Project | target} = target
PR_SetTarget :: !String !Project -> Project PR_SetTarget :: !String !Project -> Project
PR_SetTarget target project = {Project | project & target = target} PR_SetTarget target project
| target == project.Project.target
= project
= {Project | project & target = target, exec = False, saved = False}
//-- //--
......
...@@ -34,7 +34,7 @@ instance fromString Processor ...@@ -34,7 +34,7 @@ instance fromString Processor
, generate_dll :: !Bool , generate_dll :: !Bool
, dll_export_list_name :: !String , dll_export_list_name :: !String
, add_carb_resource :: !Bool // Mac-only! // , add_carb_resource :: !Bool // Mac-only!
} }
DefaultLinkOptions :: LinkOptions DefaultLinkOptions :: LinkOptions
......
...@@ -134,7 +134,7 @@ where ...@@ -134,7 +134,7 @@ where
, generate_dll :: !Bool , generate_dll :: !Bool
, dll_export_list_name :: !String , dll_export_list_name :: !String
, add_carb_resource :: !Bool // Mac-only! // , add_carb_resource :: !Bool // Mac-only!
} }
/* /*
instance == LinkOptions // do we need to check resource linking flags??? instance == LinkOptions // do we need to check resource linking flags???
...@@ -163,7 +163,7 @@ DefaultLinkOptions = ...@@ -163,7 +163,7 @@ DefaultLinkOptions =
, generate_dll = False , generate_dll = False
, dll_export_list_name = "" , dll_export_list_name = ""
, add_carb_resource = False // Clean2 ide targets Carbon?! // , add_carb_resource = False // Clean2 ide targets Carbon?!
} }
:: LinkMethod :: 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