diff --git a/ee.creator.user b/ee.creator.user index 974f34a16..93a23a92b 100644 --- a/ee.creator.user +++ b/ee.creator.user @@ -1,8 +1,10 @@ + + GenericProjectManager.GenericProject.Toolchain - ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit. + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb ProjectExplorer.Project.ActiveTarget @@ -11,565 +13,720 @@ ProjectExplorer.Project.EditorSettings - false - false - System - false - false - 4 - true - 2 - true - false - false - 0 - 4 - true - 1 - true - true - true - false + false + false + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + System + false + 4 + true + 2 + true + 0 + false + 0 + 4 + true + 1 + true + true + true + false + + ProjectExplorer.Project.PluginSettings + + ProjectExplorer.Project.Target.0 - - - GenericProjectManager.GenericTarget - 0 - 0 - 0 - - /home/programming/projects/EE - INVALID - - - - -j4 test -e DEBUGBUILD=yes NO_LIBSNDFILE=yes - - - - GenericProjectManager.GenericMakeStep + + + GenericProjectManager.GenericTarget + 14 + 0 + 8 + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 test -e DEBUGBUILD=yes NO_LIBSNDFILE=yes + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-test - debug-test - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-test + debug-test + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 test -e NO_LIBSNDFILE=yes - - Make - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 test -e NO_LIBSNDFILE=yes + + Make + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=no clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=no clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - release-test - release-test - GenericProjectManager.GenericBuildConfiguration + 2 + false + + release-test + release-test + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 test -e DEBUGBUILD=yes NO_LIBSNDFILE=yes GLES2=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 test -e DEBUGBUILD=yes NO_LIBSNDFILE=yes GLES2=yes + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-test-gles2 - debug-test-gles2 - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-test-gles2 + debug-test-gles2 + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 bnb -e DEBUGBUILD=yes NO_LIBSNDFILE=yes - - Make - Clone of - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 bnb -e DEBUGBUILD=yes NO_LIBSNDFILE=yes + + Make + Clone of + GenericProjectManager.GenericMakeStep - 1 - Build - Clone of Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - Custom Process Step - Clone of clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep - 1 - Clean - Clone of Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-test - debug-bnb - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-test + debug-bnb + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 bnb -e NO_LIBSNDFILE=yes - - Make - Clone of - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 bnb -e NO_LIBSNDFILE=yes + + Make + Clone of + GenericProjectManager.GenericMakeStep - 1 - Build - Clone of Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=no clean - /usr/bin/make - true - %{buildDir} - Custom Process Step - Clone of clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=no clean + /usr/bin/make + true + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep - 1 - Clean - Clone of Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - release-test - release-bnb - GenericProjectManager.GenericBuildConfiguration + 2 + false + + release-test + release-bnb + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 eeiv -e DEBUGBUILD=yes NO_LIBSNDFILE=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 test -e DEBUGBUILD=yes NO_LIBSNDFILE=yes GLES1=yes + + Make + Clone of + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-eeiv - debug-eeiv - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-test-gles2 + debug-test-gles1 + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 eeiv -e NO_LIBSNDFILE=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 ew -e DEBUGBUILD=yes NO_LIBSNDFILE=yes + + Make + Clone of + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=no clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - release-eeiv - release-eeiv - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-test + debug-ew + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 -e DYNAMIC=no -e DEBUGBUILD=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 ew -e NO_LIBSNDFILE=yes + + Make + Clone of Make + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=no clean + /usr/bin/make + true + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-static-lib - debug-static-lib - GenericProjectManager.GenericBuildConfiguration + 2 + false + + release-test + release-ew + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 -e DYNAMIC=no - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 eeiv -e DEBUGBUILD=yes NO_LIBSNDFILE=yes + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=no clean - make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - release-static-lib - release-static-lib - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-eeiv + debug-eeiv + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 -e DYNAMIC=yes -e DEBUGBUILD=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 eeiv -e NO_LIBSNDFILE=yes + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=no clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-dynamic-lib - debug-dynamic-lib - GenericProjectManager.GenericBuildConfiguration + 2 + false + + release-eeiv + release-eeiv + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 -e DYNAMIC=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 -e DYNAMIC=no -e DEBUGBUILD=yes + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=no clean - make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - release-dynamic-lib - release-dynamic-lib - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-static-lib + debug-static-lib + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 fluid -e DEBUGBUILD=yes NO_LIBSNDFILE=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 -e DYNAMIC=no + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=no clean + make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - debug-fluid - debug-fluid - GenericProjectManager.GenericBuildConfiguration + 2 + false + + release-static-lib + release-static-lib + GenericProjectManager.GenericBuildConfiguration - - /home/programming/projects/EE - INVALID - - - - -j4 fluid -e NO_LIBSNDFILE=yes - - - - GenericProjectManager.GenericMakeStep + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 -e DYNAMIC=yes -e DEBUGBUILD=yes + + + + GenericProjectManager.GenericMakeStep - 1 - Build - Build - ProjectExplorer.BuildSteps.Build + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - - - -e DEBUGBUILD=yes clean - /usr/bin/make - true - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean - 2 - false - - release-fluid - release-fluid - GenericProjectManager.GenericBuildConfiguration + 2 + false + + debug-dynamic-lib + debug-dynamic-lib + GenericProjectManager.GenericBuildConfiguration - 13 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 -e DYNAMIC=yes + + + + GenericProjectManager.GenericMakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build - 1 - No deployment - No deployment - ProjectExplorer.DefaultDeployConfiguration + + + -e DEBUGBUILD=no clean + make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + release-dynamic-lib + release-dynamic-lib + GenericProjectManager.GenericBuildConfiguration - 1 - - - true - 25 - - true - valgrind - + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 fluid -e DEBUGBUILD=yes NO_LIBSNDFILE=yes + + + + GenericProjectManager.GenericMakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + debug-fluid + debug-fluid + GenericProjectManager.GenericBuildConfiguration + + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb + + + + -j4 fluid -e NO_LIBSNDFILE=yes + + + + GenericProjectManager.GenericMakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + -e DEBUGBUILD=yes clean + /usr/bin/make + true + %{buildDir} + clean + clean + ProjectExplorer.ProcessStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + release-fluid + release-fluid + GenericProjectManager.GenericBuildConfiguration + + 16 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + No deployment + No deployment + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + 0 1 2 @@ -586,27 +743,7 @@ 13 14 - - 2 - /home/programming/projects/EE/eetest-debug - false - - /home/programming/projects/EE - eetest-debug - eetest-debug - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false - - - - true - 25 - - true - valgrind - + 0 1 2 @@ -623,27 +760,50 @@ 13 14 - - 2 - /home/programming/projects/EE/eetest-release - false - - %{buildDir} - eetest-release - eetest-release - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false + + 2 + /home/programming/projects/EE/eetest-debug + false + + %{buildDir} + eetest-debug + eetest-debug + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false - - - true - 25 - - true - valgrind - + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + 0 1 2 @@ -660,27 +820,7 @@ 13 14 - - 2 - /home/programming/projects/EE/eeiv-debug - false - - %{buildDir} - eeiv-debug - eeiv-debug - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false - - - - true - 25 - - true - valgrind - + 0 1 2 @@ -697,27 +837,50 @@ 13 14 - - 2 - /home/programming/projects/EE/eeiv-release - false - - %{buildDir} - eeiv-release - eeiv-release - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false + + 2 + /home/programming/projects/EE/eetest-release + false + + %{buildDir} + eetest-release + eetest-release + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false - - - true - 25 - - true - valgrind - + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + 0 1 2 @@ -734,27 +897,7 @@ 13 14 - - 2 - /home/programming/projects/EE/eefluid-debug - false - - %{buildDir} - eefluid-debug - eefluid-debug - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false - - - - true - 25 - - true - valgrind - + 0 1 2 @@ -771,27 +914,50 @@ 13 14 - - 2 - /home/programming/projects/EE/eefluid-release - false - - %{buildDir} - eefluid-release - eefluid-release - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false + + 2 + /home/programming/projects/EE/eeiv-debug + false + + %{buildDir} + eeiv-debug + eeiv-debug + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false - - - true - 25 - - true - valgrind - + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + 0 1 2 @@ -808,27 +974,7 @@ 13 14 - - 2 - /home/programming/projects/EE/bnb-debug - false - - /home/programming/projects/EE/ - Run /home/programming/projects/EE/bnb-debug - bnb-debug - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false - - - - true - 25 - - true - valgrind - + 0 1 2 @@ -845,20 +991,483 @@ 13 14 - - 2 - /home/programming/projects/EE/bnb-release - false - - /home/programming/projects/EE/ - Run /home/programming/projects/EE/bnb-release - bnb-release - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false + + 2 + /home/programming/projects/EE/eeiv-release + false + + %{buildDir} + eeiv-release + eeiv-release + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false - 8 + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + /home/programming/projects/EE/eefluid-debug + false + + %{buildDir} + eefluid-debug + eefluid-debug + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false + + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + /home/programming/projects/EE/eefluid-release + false + + %{buildDir} + eefluid-release + eefluid-release + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false + + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + /home/programming/projects/EE/bnb-debug + false + + %{buildDir} + Run /home/programming/projects/EE/bnb-debug + bnb-debug + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false + + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + /home/programming/projects/EE/bnb-release + false + + %{buildDir} + Run /home/programming/projects/EE/bnb-release + bnb-release + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false + + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + /home/programming/projects/EE/eeew-debug + false + + %{buildDir} + Run /home/programming/projects/EE/eeew-debug + eeew-debug + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false + + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + /home/programming/projects/EE/eeew-release + false + + %{buildDir} + Run /home/programming/projects/EE/eeew-release + eeew-release + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + true + false + false + + 10 @@ -871,6 +1480,6 @@ ProjectExplorer.Project.Updater.FileVersion - 9 + 10 diff --git a/ee.files b/ee.files index 4e9daf447..47a04e112 100644 --- a/ee.files +++ b/ee.files @@ -815,3 +815,4 @@ src/bnb/cgamedata.cpp src/bnb/cgameobjectdoor.hpp src/bnb/cgameobjectdoor.cpp src/audio/openal.cpp +src/test/empty_window/empty_window.cpp diff --git a/src/base.hpp b/src/base.hpp index 4ca43fc9a..dd94e766a 100644 --- a/src/base.hpp +++ b/src/base.hpp @@ -62,13 +62,7 @@ #define EE_PLATFORM EE_PLATFORM_HAIKU #endif -#if EE_PLATFORM == EE_PLATFORM_ANDROID - #if !defined( EE_GLES1 ) && !defined( EE_GLES2 ) - #define EE_GLES2 - #endif -#endif - -#if EE_PLATFORM == EE_PLATFORM_IOS +#if EE_PLATFORM == EE_PLATFORM_ANDROID || EE_PLATFORM == EE_PLATFORM_IOS #if !defined( EE_GLES1 ) && !defined( EE_GLES2 ) #define EE_GLES2 #endif @@ -95,6 +89,28 @@ #define EE_COMPILER_GCC #endif +#if defined(arm) || defined(__arm__) + #define EE_ARM +#endif + +#if EE_PLATFORM == EE_PLATFORM_ANDROID + #define EE_NO_WIDECHAR + + #define main SDL_main + + #ifndef EE_MAIN_FUNC + #ifdef __cplusplus + #define EE_MAIN_FUNC extern "C" + #else + #define EE_MAIN_FUNC + #endif + #endif +#else + #ifndef EE_MAIN_FUNC + #define EE_MAIN_FUNC + #endif +#endif + #ifndef EE_DEBUG #if defined( DEBUG ) || defined( _DEBUG ) || defined( __DEBUG ) || defined( __DEBUG__ ) #define EE_DEBUG @@ -118,6 +134,8 @@ #ifdef EE_PLATFORM #define EE_SUPPORTED_PLATFORM +#else + #error Platform not supported #endif #if ( __GNUC__ >= 4 ) && defined( EE_DYNAMIC ) && defined( EE_EXPORTS ) diff --git a/src/base/debug.cpp b/src/base/debug.cpp index 63da08987..23f29ea7c 100644 --- a/src/base/debug.cpp +++ b/src/base/debug.cpp @@ -30,7 +30,7 @@ void eeREPORT_ASSERT( const char * File, int Line, const char * Exp ) { if ( PrintDebugInLog ) cLog::instance()->Writef( "ASSERT: %s file:%s line:%d", Exp, File, Line ); - #if defined(EE_COMPILER_GCC) && defined(EE_32BIT) + #if defined(EE_COMPILER_GCC) && defined(EE_32BIT) && !defined(EE_ARM) asm("int3"); #else assert( false ); diff --git a/src/base/string.cpp b/src/base/string.cpp index 3f4908333..b1bd5c5b0 100644 --- a/src/base/string.cpp +++ b/src/base/string.cpp @@ -15,7 +15,7 @@ String::String(char ansiChar, const std::locale& locale) mString += Utf32::DecodeAnsi(ansiChar, locale); } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR String::String(wchar_t wideChar) { mString += Utf32::DecodeWide(wideChar); @@ -46,7 +46,7 @@ String::String(const std::string& ansiString, const std::locale& locale) Utf32::FromAnsi(ansiString.begin(), ansiString.end(), std::back_inserter(mString), locale); } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR String::String(const wchar_t* wideString) { if (wideString) @@ -99,7 +99,7 @@ String::operator std::string() const return ToAnsiString(); } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR String::operator std::wstring() const { return ToWideString(); @@ -118,7 +118,7 @@ std::string String::ToAnsiString(const std::locale& locale) const return output; } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR String String::ToWideString() const { // Prepare the output string diff --git a/src/base/string.hpp b/src/base/string.hpp index abb86a171..804e9a2f4 100644 --- a/src/base/string.hpp +++ b/src/base/string.hpp @@ -62,7 +62,7 @@ class EE_API String { **/ String( char ansiChar, const std::locale& locale = std::locale() ); -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR /** @brief Construct from single wide character ** @param wideChar Wide character to convert **/ @@ -92,7 +92,7 @@ class EE_API String { **/ String( const std::string& ansiString, const std::locale& locale = std::locale() ); -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR /** @brief Construct from null-terminated C-style wide string ** @param wideString Wide string to convert **/ @@ -132,7 +132,7 @@ class EE_API String { **/ operator std::string() const; -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR /** @brief Implicit cast operator to String (wide string) ** Characters that do not fit in the target encoding are ** discarded from the returned string. @@ -157,7 +157,7 @@ class EE_API String { **/ std::string ToAnsiString( const std::locale& locale = std::locale() ) const; -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR /** @brief Convert the unicode string to a wide string ** Characters that do not fit in the target encoding are ** discarded from the returned string. diff --git a/src/base/utf.hpp b/src/base/utf.hpp index 98e55f372..fbc7e807b 100644 --- a/src/base/utf.hpp +++ b/src/base/utf.hpp @@ -172,7 +172,7 @@ public : template static Out ToAnsi(In begin, In end, Out output, char replacement = 0, const std::locale& locale = std::locale()); -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR //////////////////////////////////////////////////////////// /// \brief Convert an UTF-8 characters range to wide characters /// @@ -382,7 +382,7 @@ public : template static Out ToAnsi(In begin, In end, Out output, char replacement = 0, const std::locale& locale = std::locale()); -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR //////////////////////////////////////////////////////////// /// \brief Convert an UTF-16 characters range to wide characters /// @@ -593,7 +593,7 @@ public : template static Out ToAnsi(In begin, In end, Out output, char replacement = 0, const std::locale& locale = std::locale()); -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR //////////////////////////////////////////////////////////// /// \brief Convert an UTF-32 characters range to wide characters /// @@ -716,7 +716,7 @@ public : template static Out EncodeAnsi(Uint32 codepoint, Out output, char replacement = 0, const std::locale& locale = std::locale()); -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR //////////////////////////////////////////////////////////// /// \brief Encode a single UTF-32 character to wide /// diff --git a/src/base/utf.inl b/src/base/utf.inl index e8ff65692..82e222581 100644 --- a/src/base/utf.inl +++ b/src/base/utf.inl @@ -170,7 +170,7 @@ Out Utf<8>::ToAnsi(In begin, In end, Out output, char replacement, const std::lo return output; } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR template Out Utf<8>::ToWide(In begin, In end, Out output, wchar_t replacement) { @@ -376,7 +376,7 @@ Out Utf<16>::ToAnsi(In begin, In end, Out output, char replacement, const std::l return output; } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR template Out Utf<16>::ToWide(In begin, In end, Out output, wchar_t replacement) { @@ -504,7 +504,7 @@ Out Utf<32>::ToAnsi(In begin, In end, Out output, char replacement, const std::l return output; } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR template Out Utf<32>::ToWide(In begin, In end, Out output, wchar_t replacement) { @@ -627,7 +627,7 @@ Out Utf<32>::EncodeAnsi(Uint32 codepoint, Out output, char replacement, const st #endif } -#if EE_PLATFORM != EE_PLATFORM_ANDROID +#ifndef EE_NO_WIDECHAR template Out Utf<32>::EncodeWide(Uint32 codepoint, Out output, wchar_t replacement) { diff --git a/src/system/cthread.cpp b/src/system/cthread.cpp index ebd56308d..6066d8f9d 100755 --- a/src/system/cthread.cpp +++ b/src/system/cthread.cpp @@ -71,7 +71,7 @@ void cThread::Terminate() { #elif defined( EE_PLATFORM_POSIX ) - #ifndef ANDROID + #if EE_PLATFORM != EE_PLATFORM_ANDROID pthread_cancel( mThread ); #else pthread_kill( mThread , SIGUSR1 ); diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index a398c60fa..6ed3cbb89 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -1792,7 +1792,7 @@ void cEETest::End() { cEngine::DestroySingleton(); } -int main (int argc, char * argv []) { +EE_MAIN_FUNC int main (int argc, char * argv []) { cEETest * Test = eeNew( cEETest, () ); Test->Process(); diff --git a/src/test/empty_window/empty_window.cpp b/src/test/empty_window/empty_window.cpp new file mode 100644 index 000000000..34258143a --- /dev/null +++ b/src/test/empty_window/empty_window.cpp @@ -0,0 +1,58 @@ +#include "../../ee.h" + +// EE_MAIN_FUNC is needed for some platforms to export the main function as C function. +EE_MAIN_FUNC int main (int argc, char * argv []) +{ + // Create a new window + cWindow * win = cEngine::instance()->CreateWindow( WindowSettings( 800, 600, 32, WindowStyle::Default, "", "eepp - Empty Window" ), ContextSettings( ) ); + + // Check if created + if ( win->Created() ) + { + // Get input pointer + cInput * imp = win->GetInput(); + + // Application loop + while ( win->Running() ) + { + // Update the input + imp->Update(); + + // Check if ESCAPE key is pressed + if ( imp->IsKeyDown( KEY_ESCAPE ) ) + { + // Close the window + win->Close(); + } + + // Create an instance of the primitive renderer + cPrimitives p; + + // Set the primitive color + p.SetColor( eeColorA( 0, 150, 0, 150 ) ); + + // Draw a rectangle + p.DrawRectangle( 100, 100, win->GetWidth() - 200, win->GetHeight() - 200 ); + + // Change the color + p.SetColor( eeColorA( 0, 255, 0, 150 ) ); + + // Draw a circle + p.DrawCircle( win->GetWidth() / 2, win->GetHeight() / 2, 200 ); + + // Draw frame + win->Display(); + + // Sleep thread for 10 ms + eeSleep( 10 ); + } + } + + // Destroy the engine instance. Destroys all the windows and engine singletons. + cEngine::DestroySingleton(); + + // If was compiled in debug mode it will print the memory manager report + EE::MemoryManager::LogResults(); + + return 0; +} diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp index 5a4bc4bce..c6ea75a98 100755 --- a/src/utils/utils.cpp +++ b/src/utils/utils.cpp @@ -389,6 +389,8 @@ std::string GetProcessPath() { } return FileRemoveFileName( std::string( info.name ) ); +#elif EE_PLATFORM == EE_PLATFORM_ANDROID + return "/sdcard/"; #else #warning GetProcessPath() not implemented on this platform. ( will return "./" ) return "./";