diff options
| author | okamstudio <juan@okamstudio.com> | 2014-02-26 11:10:53 -0200 |
|---|---|---|
| committer | okamstudio <juan@okamstudio.com> | 2014-02-26 11:10:53 -0200 |
| commit | f09a1cca076fafda3107a946e4d5ac28cb39a9d3 (patch) | |
| tree | 7cc8754b828a5eec66e8523eb22967b5a696da5b | |
| parent | ed6d9463d264d0983f75c2dc93191c8526e9115b (diff) | |
| parent | 68fa537c3e6a82c1ce26f54511ce92c9b90d9c7a (diff) | |
Merge pull request #144 from C4NCER/master
move away from deprecated Options class and update .gitignore
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | SConstruct | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index de9eed200a..abe1a234f5 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ Desktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ +logo.h diff --git a/SConstruct b/SConstruct index 93e48a069f..4df8e0089d 100644 --- a/SConstruct +++ b/SConstruct @@ -88,7 +88,7 @@ if profile: elif os.path.isfile(profile+".py"): customs.append(profile+".py") -opts=Options(customs, ARGUMENTS) +opts=Variables(customs, ARGUMENTS) opts.Add('target', 'Compile Target (debug/profile/release).', "debug") opts.Add('platform','Platform: '+str(platform_list)+'(sfml).',"") opts.Add('python','Build Python Support: (yes/no)','no') |