diff --git a/premake4.lua b/premake4.lua index 3106f02c1..bb8dcda48 100644 --- a/premake4.lua +++ b/premake4.lua @@ -2,6 +2,8 @@ newoption { trigger = "with-libsndfile", description = "Build with libsndfile su newoption { trigger = "with-static-freetype", description = "Build freetype as a static library." } newoption { trigger = "with-eepp-static", description = "Force to build the demos and tests with eepp compiled statically" } newoption { trigger = "with-static-backend", description = "It will try to compile the library with a static backend (only for gcc and mingw).\n\t\t\t\tThe backend should be placed in libs/your_platform/libYourBackend.a" } +newoption { trigger = "with-gles2", description = "Compile with GLES2 support" } +newoption { trigger = "with-gles1", description = "Compile with GLES1 support" } newoption { trigger = "with-backend", description = "Select the backend to use for window and input handling.\n\t\t\tIf no backend is selected or if the selected is not installed the script will search for a backend present in the system, and will use it.\n\t\t\tIt's possible to build with more than one backend support.\n\t\t\t\tUse comma to separate the backends to build ( you can't mix SDL and SDL2, you'll get random crashes ).\n\t\t\t\tExample: --with-backend=SDL2,SFML2", @@ -149,11 +151,11 @@ function generate_os_links() end function parse_args() - if args_contains( "GLES2" ) then + if _OPTIONS["with-gles2"] then defines { "EE_GLES2", "SOIL_GLES2" } end - if args_contains( "GLES1" ) then + if _OPTIONS["with-gles1"] then defines { "EE_GLES1", "SOIL_GLES1" } end end @@ -354,7 +356,7 @@ solution "eepp" location("./make/" .. os.get() .. "/") targetdir("./") configurations { "debug", "release" } - objdir("obj/" .. os.get() .. "/premake4/") + objdir("obj/" .. os.get() .. "/") generate_os_links() parse_args() diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index 5408a37e6..198ae7754 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -48,16 +48,16 @@ Desktop Desktop {388e5431-b31b-42b3-b9ad-9002d279d75d} - 0 + 12 0 0 - /home/programming/eepp + /home/programming/eepp/make/linux false - -j4 -e DEBUGBUILD=yes test + -j4 eepp-test make true @@ -72,8 +72,8 @@ true - -e DEBUGBUILD=yes clean - /usr/bin/make + clean + make %{buildDir} clean clean @@ -97,7 +97,7 @@ false - -j4 test + -j4 config=release eepp-test true Make @@ -112,7 +112,7 @@ true - -e DEBUGBUILD=no clean + -e config=release clean /usr/bin/make %{buildDir} clean @@ -132,19 +132,28 @@ GenericProjectManager.GenericBuildConfiguration - /home/programming/eepp + /home/programming/eepp/make/linux + true + --with-static-backend gmake + premake4 + %{buildDir}../../../ + Custom Process Step + + ProjectExplorer.ProcessStep + + false - -j4 -e DEBUGBUILD=yes GLES2=yes ew - + -j4 + make true Make GenericProjectManager.GenericMakeStep - 1 + 2 Build ProjectExplorer.BuildSteps.Build @@ -152,8 +161,8 @@ true - -e DEBUGBUILD=yes clean - /usr/bin/make + clean + make %{buildDir} Custom Process Step @@ -167,97 +176,164 @@ 2 false - debug-test-gles2 - debug-ew-gles2 - GenericProjectManager.GenericBuildConfiguration - - - /home/programming/eepp - - - - false - -j4 -e DEBUGBUILD=yes - - true - Make - Clone of - GenericProjectManager.GenericMakeStep - - 1 - Build - Clone of Build - ProjectExplorer.BuildSteps.Build - - - - true - -e DEBUGBUILD=yes clean - /usr/bin/make - %{buildDir} - Custom Process Step - Clone of clean - ProjectExplorer.ProcessStep - - 1 - Clean - Clone of Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - debug-test - debug-es + debug-all GenericProjectManager.GenericBuildConfiguration - - /home/programming/eepp + + /home/programming/eepp/make/linux + true + --with-static-backend gmake + premake4 + %{buildDir}../../../ + Custom Process Step + + ProjectExplorer.ProcessStep + + false - -j4 es - + -j4 -e config=release + make true Make - Clone of Make + GenericProjectManager.GenericMakeStep - 1 + 2 Build - Clone of Build + ProjectExplorer.BuildSteps.Build true - -e DEBUGBUILD=no clean - /usr/bin/make + -e config=release clean + make %{buildDir} Custom Process Step - Clone of clean + ProjectExplorer.ProcessStep 1 Clean - Clone of Clean + ProjectExplorer.BuildSteps.Clean 2 false - release-test - release-es + debug-test + release-all + GenericProjectManager.GenericBuildConfiguration + + + /home/programming/eepp/projects/mingw32 + + + true + --os=windows --with-eepp-static --with-static-freetype gmake + premake4 + %{buildDir}../../../ + Custom Process Step + + ProjectExplorer.ProcessStep + + + + false + -j4 + make.sh + true + Make + + GenericProjectManager.GenericMakeStep + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + clean + make.sh + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + debug-test + debig-win-all + GenericProjectManager.GenericBuildConfiguration + + + /home/programming/eepp/projects/mingw32 + + + true + --os=windows --with-eepp-static --with-static-freetype gmake + premake4 + %{buildDir}../../../ + Custom Process Step + + ProjectExplorer.ProcessStep + + + + false + -j4 -e config=release + make.sh + true + Make + + GenericProjectManager.GenericMakeStep + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + -e config=release clean + make.sh + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + debug-test + release-win-all GenericProjectManager.GenericBuildConfiguration - /home/programming/eepp + /home/programming/eepp/make/linux false - -j4 -e DEBUGBUILD=yes + -j4 eepp-static true @@ -272,7 +348,7 @@ true - -e DEBUGBUILD=yes clean + clean /usr/bin/make %{buildDir} clean @@ -292,12 +368,12 @@ GenericProjectManager.GenericBuildConfiguration - /home/programming/eepp + /home/programming/eepp/make/linux false - -j4 + -j4 -e config=release eepp-static true @@ -312,7 +388,7 @@ true - -e DEBUGBUILD=no clean + -e config=release clean make %{buildDir} clean @@ -332,12 +408,12 @@ GenericProjectManager.GenericBuildConfiguration - /home/programming/eepp + /home/programming/eepp/make/linux false - -j4 -e DYNAMIC=yes DEBUGBUILD=yes + -j4 eepp-shared true @@ -352,8 +428,8 @@ true - -e DEBUGBUILD=yes clean - /usr/bin/make + clean + make %{buildDir} clean clean @@ -372,12 +448,12 @@ GenericProjectManager.GenericBuildConfiguration - /home/programming/eepp + /home/programming/eepp/make/linux false - -j4 -e DYNAMIC=yes + -j4 -e config=release eepp-shared true @@ -392,7 +468,7 @@ true - -e DEBUGBUILD=no clean + -e config=release clean make %{buildDir} clean @@ -412,52 +488,12 @@ GenericProjectManager.GenericBuildConfiguration - /home/programming/eepp + /home/programming/eepp/make/linux false - -j4 -e DEBUGBUILD=yes GLES2=yes test - - true - - - GenericProjectManager.GenericMakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - -e DEBUGBUILD=yes clean - /usr/bin/make - %{buildDir} - clean - clean - ProjectExplorer.ProcessStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - debug-test-gles2 - debug-test-gles2 - GenericProjectManager.GenericBuildConfiguration - - - /home/programming/eepp - - - - false - -j4 -e DEBUGBUILD=yes GLES1=yes test + -j4 eepp-ew true Make @@ -472,47 +508,7 @@ true - -e DEBUGBUILD=yes clean - /usr/bin/make - %{buildDir} - Custom Process Step - Clone of clean - ProjectExplorer.ProcessStep - - 1 - Clean - Clone of Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - debug-test-gles2 - debug-test-gles1 - GenericProjectManager.GenericBuildConfiguration - - - /home/programming/eepp - - - - false - -j4 -e DEBUGBUILD=yes ew - - true - Make - Clone of - GenericProjectManager.GenericMakeStep - - 1 - Build - Clone of Build - ProjectExplorer.BuildSteps.Build - - - - true - -e DEBUGBUILD=yes clean + clean /usr/bin/make %{buildDir} Custom Process Step @@ -531,13 +527,13 @@ debug-ew GenericProjectManager.GenericBuildConfiguration - - /home/programming/eepp + + /home/programming/eepp/make/linux false - -j4 ew + -j4 -e config=release eepp-ew true Make @@ -552,7 +548,7 @@ true - -e DEBUGBUILD=no clean + -e config=release clean /usr/bin/make %{buildDir} Custom Process Step @@ -571,7 +567,87 @@ release-ew GenericProjectManager.GenericBuildConfiguration - 13 + + /home/programming/eepp/make/linux + + + + false + -j4 eepp-es + + true + Make + Clone of + GenericProjectManager.GenericMakeStep + + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build + + + + true + clean + /usr/bin/make + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep + + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + debug-test + debug-es + GenericProjectManager.GenericBuildConfiguration + + + /home/programming/eepp/make/linux + + + + false + -j4 -e config=release eepp-es + + true + Make + Clone of Make + GenericProjectManager.GenericMakeStep + + 1 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build + + + + true + -e config=release clean + /usr/bin/make + %{buildDir} + Custom Process Step + Clone of clean + ProjectExplorer.ProcessStep + + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + release-test + release-es + GenericProjectManager.GenericBuildConfiguration + + 14 0 diff --git a/projects/mingw32/make.sh b/projects/mingw32/make.sh new file mode 100755 index 000000000..7e6643c56 --- /dev/null +++ b/projects/mingw32/make.sh @@ -0,0 +1,4 @@ +#!/bin/sh +cd $(dirname "$0") +cd ../../make/windows/ +make -e CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ AR=i686-w64-mingw32-ar $@ diff --git a/projects/mingw32/mingw32-cross-compile.sh b/projects/mingw32/mingw32-cross-compile.sh deleted file mode 100755 index 9df1f5e8f..000000000 --- a/projects/mingw32/mingw32-cross-compile.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -cd $(dirname "$0") -cd ../../make/windows/ -make -j4 -e CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ AR=i686-w64-mingw32-ar $@