diff options
Diffstat (limited to 'devtools/create_project')
| -rw-r--r-- | devtools/create_project/cmake.cpp | 4 | ||||
| -rw-r--r-- | devtools/create_project/create_project.cpp | 17 | ||||
| -rw-r--r-- | devtools/create_project/create_project.h | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp index 1423e686be..fad9a28367 100644 --- a/devtools/create_project/cmake.cpp +++ b/devtools/create_project/cmake.cpp @@ -48,7 +48,9 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f { "vorbis", 0, 0, 0, 0, "vorbisfile vorbis ogg" }, { "theora", 0, 0, 0, 0, "theoradec" }, { "fluidsynth",0, 0, 0, 0, "fluidsynth" }, - { "faad", 0, 0, 0, 0, "faad" } + { "faad", 0, 0, 0, 0, "faad" }, + { "libcurl", "FindCURL", "CURL", "CURL_INCLUDE_DIRS", "CURL_LIBRARIES", 0 }, + { "sdlnet", "FindSDL_net", "SDL_net", "SDL_NET_INCLUDE_DIRS", "SDL_NET_LIBRARIES", 0 } }; for (unsigned int i = 0; i < sizeof(s_libraries) / sizeof(s_libraries[0]); i++) { diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 8841eaa73d..91690c2128 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -284,8 +284,8 @@ int main(int argc, char *argv[]) { setup.devTools = true; } else if (!std::strcmp(argv[i], "--tests")) { setup.tests = true; - } else if (!std::strcmp(argv[i], "--sdl2")) { - setup.useSDL2 = true; + } else if (!std::strcmp(argv[i], "--sdl1")) { + setup.useSDL2 = false; } else { std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n"; return -1; @@ -700,7 +700,7 @@ void displayHelp(const char *exe) { " --disable-<name> disable inclusion of the feature \"name\"\n" "\n" "SDL settings:\n" - " --sdl2 link to SDL 2.0, instead of SDL 1.2\n" + " --sdl1 link to SDL 1.2, instead of SDL 2.0\n" "\n" " There are the following features available:\n" "\n"; @@ -1000,10 +1000,12 @@ const Feature s_features[] = { { "png", "USE_PNG", "libpng16", true, "libpng support" }, { "faad", "USE_FAAD", "libfaad", false, "AAC support" }, { "mpeg2", "USE_MPEG2", "libmpeg2", false, "MPEG-2 support" }, - { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, - { "freetype", "USE_FREETYPE2", "freetype", true, "FreeType support" }, - { "jpeg", "USE_JPEG", "jpeg-static", true, "libjpeg support" }, - {"fluidsynth", "USE_FLUIDSYNTH", "libfluidsynth", true, "FluidSynth support" }, + { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, + { "freetype", "USE_FREETYPE2", "freetype", true, "FreeType support" }, + { "jpeg", "USE_JPEG", "jpeg-static", true, "libjpeg support" }, + {"fluidsynth", "USE_FLUIDSYNTH", "libfluidsynth", true, "FluidSynth support" }, + { "libcurl", "USE_LIBCURL", "libcurl", true, "libcurl support" }, + { "sdlnet", "USE_SDL_NET", "SDL_net", true, "SDL_net support" }, // Feature flags { "bink", "USE_BINK", "", true, "Bink video support" }, @@ -1015,6 +1017,7 @@ const Feature s_features[] = { { "opengl", "USE_OPENGL", "", true, "OpenGL support" }, { "opengles", "USE_GLES", "", true, "forced OpenGL ES mode" }, { "taskbar", "USE_TASKBAR", "", true, "Taskbar integration support" }, + { "cloud", "USE_CLOUD", "", true, "Cloud integration support" }, { "translation", "USE_TRANSLATION", "", true, "Translation support" }, { "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"}, { "keymapper", "ENABLE_KEYMAPPER", "", false, "Keymapper support"}, diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index 1e417d485b..bd0dcf6be9 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -239,7 +239,7 @@ struct BuildSetup { tests = false; runBuildEvents = false; createInstaller = false; - useSDL2 = false; + useSDL2 = true; } }; |