remove deprecated add_defines_h and add_defines_if_ok

2 files changed, 1 insertions, 51 deletions

diff --git a/xmake/core/project/deprecated/project.lua b/xmake/core/project/deprecated/project.lua
index e90f5ad26..ea6a103d8 100644
--- a/xmake/core/project/deprecated/project.lua
+++ b/xmake/core/project/deprecated/project.lua
@@ -170,42 +170,6 @@ function deprecated_project._api_target_add_headerdirs(interp)
                                         end)
 end
 
--- add_defines_h for target
-function deprecated_project._api_target_add_defines_h(interp)
-
-    -- get api function
-    local apifunc = interp:_api_within_scope("target", "add_defines_h")
-    assert(apifunc)
-
-    -- register api
-    interp:_api_within_scope_set("target", "add_defines_h", function (value, ...)
-
-                                            -- deprecated
-                                            deprecated.add("add_configfiles() and set_configvar(%s)", "add_defines_h(%s)", tostring(value))
-
-                                            -- dispatch it
-                                            apifunc(value, ...)
-                                        end)
-end
-
--- add_defines_h for option
-function deprecated_project._api_option_add_defines_h(interp)
-
-    -- get api function
-    local apifunc = interp:_api_within_scope("option", "add_defines_h")
-    assert(apifunc)
-
-    -- register api
-    interp:_api_within_scope_set("option", "add_defines_h", function (value, ...)
-
-                                            -- deprecated
-                                            deprecated.add("add_configfiles() and set_configvar(%s)", "add_defines_h(%s)", tostring(value))
-
-                                            -- dispatch it
-                                            apifunc(value, ...)
-                                        end)
-end
-
 -- set_config_header for target
 function deprecated_project._api_target_set_config_header(interp)
 
@@ -341,9 +305,7 @@ function deprecated_project.api_register(interp)
     deprecated_project._api_target_add_headers(interp)
     deprecated_project._api_target_add_headerdirs(interp)
 
-    -- register api: add_defines_h()/set_config_header() to option/target
-    deprecated_project._api_option_add_defines_h(interp)
-    deprecated_project._api_target_add_defines_h(interp)
+    -- register api: set_config_header() to option/target
     deprecated_project._api_target_set_config_header(interp)
 
     -- register api: set_headerdir() to target
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index ba97f973b..75cfa106e 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -560,20 +560,8 @@ function project._load_options(disable_filter)
     -- check options
     local options = {}
     for optionname, optioninfo in pairs(results) do
-
-        -- init an option instance
         local instance = option.new(optionname, optioninfo)
-
-        -- save it
         options[optionname] = instance
-
-        -- mark add_defines_h_if_ok and add_undefines_h_if_ok as deprecated
-        if instance:get("defines_h_if_ok") then
-            deprecated.add("add_defines_h(\"%s\")", "add_defines_h_if_ok(\"%s\")", table.concat(table.wrap(instance:get("defines_h_if_ok")), "\", \""))
-        end
-        if instance:get("undefines_h_if_ok") then
-            deprecated.add("add_undefines_h(\"%s\")", "add_undefines_h_if_ok(\"%s\")", table.concat(table.wrap(instance:get("undefines_h_if_ok")), "\", \""))
-        end
     end
 
     -- load and attach options deps