mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 15:47:46 +00:00
Code Activity

Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop

Browse source
This commit is contained in:
Mordred 2018-12-30 17:36:48 +01:00
commit 46780bf5cd
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/web/login.html
View file

@ -43,6 +43,14 @@
return data; return data;
} }
function keypressing(e) {
if (!e) e = window.event;
var keyCode = e.keyCode || e.which;
if (keyCode == '13'){
doLogin();
return false;
}
}
</script> </script>
@ -79,7 +87,7 @@
<div class="input-control"> <div class="input-control">
<label class="s-login-input-wrapper"> <label class="s-login-input-wrapper">
Password Password
<input type="password" name="password"> <input type="password" name="password" onkeypress="return keypressing(event)">
</label> </label>
</div> </div>
<button class="btn btn-default s-login-btn pull-right" id="submitButton" onclick="doLogin()">Login</button> <button class="btn btn-default s-login-btn pull-right" id="submitButton" onclick="doLogin()">Login</button>

8
cmake/compiler.cmake
View file

@ -10,6 +10,14 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
if (MSVC_VERSION GREATER_EQUAL "1900")
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("/std:c++latest" _cpp_latest_flag_supported)
if (_cpp_latest_flag_supported)
add_compile_options("/std:c++latest")
endif()
endif()
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
# disabling SAFESEH # disabling SAFESEH
message(STATUS "Disabling Safe Exception Handlers..") message(STATUS "Disabling Safe Exception Handlers..")