diff --git a/_cmptest/cfgdata/bzip2/darwin/1.0.8/llcppg.cfg b/_cmptest/cfgdata/bzip2/darwin/1.0.8/llcppg.cfg index 7bd359a1..b7beebd8 100644 --- a/_cmptest/cfgdata/bzip2/darwin/1.0.8/llcppg.cfg +++ b/_cmptest/cfgdata/bzip2/darwin/1.0.8/llcppg.cfg @@ -4,11 +4,5 @@ "libs": "$(pkg-config --libs bzip2)", "include": [ "bzlib.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/bzip2/linux/1.0.8/llcppg.cfg b/_cmptest/cfgdata/bzip2/linux/1.0.8/llcppg.cfg index 7bd359a1..b7beebd8 100644 --- a/_cmptest/cfgdata/bzip2/linux/1.0.8/llcppg.cfg +++ b/_cmptest/cfgdata/bzip2/linux/1.0.8/llcppg.cfg @@ -4,11 +4,5 @@ "libs": "$(pkg-config --libs bzip2)", "include": [ "bzlib.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/bzip3/darwin/1.5.1/llcppg.cfg b/_cmptest/cfgdata/bzip3/darwin/1.5.1/llcppg.cfg index 3574f1b2..dfda6239 100644 --- a/_cmptest/cfgdata/bzip3/darwin/1.5.1/llcppg.cfg +++ b/_cmptest/cfgdata/bzip3/darwin/1.5.1/llcppg.cfg @@ -4,11 +4,5 @@ "libs": "$(pkg-config --libs bzip3)", "include": [ "libbz3.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/bzip3/linux/1.5.1/llcppg.cfg b/_cmptest/cfgdata/bzip3/linux/1.5.1/llcppg.cfg index 3574f1b2..dfda6239 100644 --- a/_cmptest/cfgdata/bzip3/linux/1.5.1/llcppg.cfg +++ b/_cmptest/cfgdata/bzip3/linux/1.5.1/llcppg.cfg @@ -4,11 +4,5 @@ "libs": "$(pkg-config --libs bzip3)", "include": [ "libbz3.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/cargs/darwin/1.2.0/llcppg.cfg b/_cmptest/cfgdata/cargs/darwin/1.2.0/llcppg.cfg index 21b30c1e..a7934407 100644 --- a/_cmptest/cfgdata/cargs/darwin/1.2.0/llcppg.cfg +++ b/_cmptest/cfgdata/cargs/darwin/1.2.0/llcppg.cfg @@ -4,11 +4,5 @@ "libs": "$(pkg-config --libs cargs)", "include": [ "cargs.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/cargs/linux/1.2.0/llcppg.cfg b/_cmptest/cfgdata/cargs/linux/1.2.0/llcppg.cfg index 21b30c1e..a7934407 100644 --- a/_cmptest/cfgdata/cargs/linux/1.2.0/llcppg.cfg +++ b/_cmptest/cfgdata/cargs/linux/1.2.0/llcppg.cfg @@ -4,11 +4,5 @@ "libs": "$(pkg-config --libs cargs)", "include": [ "cargs.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/cjson/darwin/1.7.17/llcppg.cfg b/_cmptest/cfgdata/cjson/darwin/1.7.17/llcppg.cfg index 228819b8..b8ea02ee 100644 --- a/_cmptest/cfgdata/cjson/darwin/1.7.17/llcppg.cfg +++ b/_cmptest/cfgdata/cjson/darwin/1.7.17/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "cjson/cJSON_Utils.h", "cjson/cJSON.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/cjson/darwin/1.7.18/llcppg.cfg b/_cmptest/cfgdata/cjson/darwin/1.7.18/llcppg.cfg index 228819b8..b8ea02ee 100644 --- a/_cmptest/cfgdata/cjson/darwin/1.7.18/llcppg.cfg +++ b/_cmptest/cfgdata/cjson/darwin/1.7.18/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "cjson/cJSON_Utils.h", "cjson/cJSON.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/cjson/linux/1.7.17/llcppg.cfg b/_cmptest/cfgdata/cjson/linux/1.7.17/llcppg.cfg index 228819b8..b8ea02ee 100644 --- a/_cmptest/cfgdata/cjson/linux/1.7.17/llcppg.cfg +++ b/_cmptest/cfgdata/cjson/linux/1.7.17/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "cjson/cJSON_Utils.h", "cjson/cJSON.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/cjson/linux/1.7.18/llcppg.cfg b/_cmptest/cfgdata/cjson/linux/1.7.18/llcppg.cfg index 228819b8..b8ea02ee 100644 --- a/_cmptest/cfgdata/cjson/linux/1.7.18/llcppg.cfg +++ b/_cmptest/cfgdata/cjson/linux/1.7.18/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "cjson/cJSON_Utils.h", "cjson/cJSON.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/libtool/darwin/2.4.7/llcppg.cfg b/_cmptest/cfgdata/libtool/darwin/2.4.7/llcppg.cfg index 97c754ae..0fd782c7 100644 --- a/_cmptest/cfgdata/libtool/darwin/2.4.7/llcppg.cfg +++ b/_cmptest/cfgdata/libtool/darwin/2.4.7/llcppg.cfg @@ -7,11 +7,5 @@ "libltdl/lt_dlloader.h", "libltdl/lt_error.h", "libltdl/lt_system.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/libtool/linux/2.4.7/llcppg.cfg b/_cmptest/cfgdata/libtool/linux/2.4.7/llcppg.cfg index 97c754ae..0fd782c7 100644 --- a/_cmptest/cfgdata/libtool/linux/2.4.7/llcppg.cfg +++ b/_cmptest/cfgdata/libtool/linux/2.4.7/llcppg.cfg @@ -7,11 +7,5 @@ "libltdl/lt_dlloader.h", "libltdl/lt_error.h", "libltdl/lt_system.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/libxml2/darwin/2.13.6/llcppg.cfg b/_cmptest/cfgdata/libxml2/darwin/2.13.6/llcppg.cfg index a0379aaa..3edf2378 100644 --- a/_cmptest/cfgdata/libxml2/darwin/2.13.6/llcppg.cfg +++ b/_cmptest/cfgdata/libxml2/darwin/2.13.6/llcppg.cfg @@ -52,11 +52,5 @@ "libxml2/win32config.h", "zlib.h", "zconf.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/libxml2/linux/2.13.6/llcppg.cfg b/_cmptest/cfgdata/libxml2/linux/2.13.6/llcppg.cfg index a0379aaa..3edf2378 100644 --- a/_cmptest/cfgdata/libxml2/linux/2.13.6/llcppg.cfg +++ b/_cmptest/cfgdata/libxml2/linux/2.13.6/llcppg.cfg @@ -52,11 +52,5 @@ "libxml2/win32config.h", "zlib.h", "zconf.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/sqlite3/darwin/3.49.1/llcppg.cfg b/_cmptest/cfgdata/sqlite3/darwin/3.49.1/llcppg.cfg index 85adc78e..840ace64 100644 --- a/_cmptest/cfgdata/sqlite3/darwin/3.49.1/llcppg.cfg +++ b/_cmptest/cfgdata/sqlite3/darwin/3.49.1/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "sqlite3ext.h", "sqlite3.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/sqlite3/linux/3.49.1/llcppg.cfg b/_cmptest/cfgdata/sqlite3/linux/3.49.1/llcppg.cfg index 85adc78e..840ace64 100644 --- a/_cmptest/cfgdata/sqlite3/linux/3.49.1/llcppg.cfg +++ b/_cmptest/cfgdata/sqlite3/linux/3.49.1/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "sqlite3ext.h", "sqlite3.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/zlib/darwin/1.3.1/llcppg.cfg b/_cmptest/cfgdata/zlib/darwin/1.3.1/llcppg.cfg index 8038796b..0f91d5a8 100644 --- a/_cmptest/cfgdata/zlib/darwin/1.3.1/llcppg.cfg +++ b/_cmptest/cfgdata/zlib/darwin/1.3.1/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "zlib.h", "zconf.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/_cmptest/cfgdata/zlib/linux/1.3.1/llcppg.cfg b/_cmptest/cfgdata/zlib/linux/1.3.1/llcppg.cfg index 8038796b..0f91d5a8 100644 --- a/_cmptest/cfgdata/zlib/linux/1.3.1/llcppg.cfg +++ b/_cmptest/cfgdata/zlib/linux/1.3.1/llcppg.cfg @@ -5,11 +5,5 @@ "include": [ "zlib.h", "zconf.h" - ], - "trimPrefixes": null, - "cplusplus": false, - "deps": [], - "keepUnderScore": false, - "impl": null, - "mix": false + ] } diff --git a/config/config.go b/config/config.go index e9935d8d..44916a89 100644 --- a/config/config.go +++ b/config/config.go @@ -25,12 +25,12 @@ type Config struct { CFlags string `json:"cflags"` Libs string `json:"libs"` Include []string `json:"include"` - TrimPrefixes []string `json:"trimPrefixes"` - Cplusplus bool `json:"cplusplus"` - Deps []string `json:"deps"` - KeepUnderScore bool `json:"keepUnderScore"` - Impl []ImplFiles `json:"impl"` - Mix bool `json:"mix"` + TrimPrefixes []string `json:"trimPrefixes,omitempty"` + Cplusplus bool `json:"cplusplus,omitempty"` + Deps []string `json:"deps,omitempty"` + KeepUnderScore bool `json:"keepUnderScore,omitempty"` + Impl []ImplFiles `json:"impl,omitempty"` + Mix bool `json:"mix,omitempty"` SymMap map[string]string `json:"symMap,omitempty"` TypeMap map[string]string `json:"typeMap,omitempty"` }