N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3634 from ccawley2011/citra-room-glad

Browse source 
citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress
This commit is contained in:
Weiyi Wang 2018-04-12 22:45:30 +03:00 committed by GitHub
commit ca6f6f172b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dedicated_room/CMakeLists.txt
View file

@ -12,7 +12,7 @@ target_link_libraries(citra-room PRIVATE glad)
if (MSVC) if (MSVC)
target_link_libraries(citra-room PRIVATE getopt) target_link_libraries(citra-room PRIVATE getopt)
endif() endif()
target_link_libraries(citra-room PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads) target_link_libraries(citra-room PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
install(TARGETS citra-room RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") install(TARGETS citra-room RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")

4
src/dedicated_room/citra-room.cpp
View file

@ -8,8 +8,6 @@
#include <regex> #include <regex>
#include <string> #include <string>
#include <thread> #include <thread>
#define SDL_MAIN_HANDLED
#include <SDL.h>
#include <glad/glad.h> #include <glad/glad.h>
#ifdef _MSC_VER #ifdef _MSC_VER
@ -60,7 +58,7 @@ int main(int argc, char** argv) {
char* endarg; char* endarg;
// This is just to be able to link against core // This is just to be able to link against core
gladLoadGLLoader(static_cast<GLADloadproc>(SDL_GL_GetProcAddress)); gladLoadGL();
std::string room_name; std::string room_name;
std::string password; std::string password;