ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* add some GL base to libui (only for Windows for now) 

* make the Codeblocks project a bit less braindead (don't repeat libraries for each build target)
This commit is contained in:
Arisotura 2019-03-31 21:54:14 +02:00
parent 75f8cbf953
commit b48fe5909b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -138,6 +138,7 @@ elseif (WIN32)
src/libui_sdl/libui/windows/fontbutton.cpp
src/libui_sdl/libui/windows/fontdialog.cpp
src/libui_sdl/libui/windows/form.cpp
src/libui_sdl/libui/windows/gl.cpp
src/libui_sdl/libui/windows/graphemes.cpp
src/libui_sdl/libui/windows/grid.cpp
src/libui_sdl/libui/windows/group.cpp
@ -172,6 +173,7 @@ elseif (WIN32)
LINK_LIBRARIES("usp10")
LINK_LIBRARIES("ws2_32")
LINK_LIBRARIES("uxtheme")
LINK_LIBRARIES("opengl32")
endif (UNIX)
find_package(SDL2 REQUIRED)

1
melonDS.cbp
View File

@ -222,6 +222,7 @@
<Unit filename="src/libui_sdl/libui/windows/fontbutton.cpp" />
<Unit filename="src/libui_sdl/libui/windows/fontdialog.cpp" />
<Unit filename="src/libui_sdl/libui/windows/form.cpp" />
<Unit filename="src/libui_sdl/libui/windows/gl.cpp" />
<Unit filename="src/libui_sdl/libui/windows/graphemes.cpp" />
<Unit filename="src/libui_sdl/libui/windows/grid.cpp" />
<Unit filename="src/libui_sdl/libui/windows/group.cpp" />

2
src/libui_sdl/libui/ui.h
View File

@ -601,11 +601,11 @@ _UI_EXTERN void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayou
// OpenGL support
// TODO for later: allow using OpenGL inside a uiWindow or uiArea
typedef struct uiGLContext uiGLContext;
_UI_EXTERN uiGLContext *uiGLNewContext(uiControl* c);
_UI_EXTERN void uiGLFreeContext(uiGLContext* ctx);
_UI_EXTERN void uiGLMakeContextCurrent(uiGLContext* ctx);
_UI_EXTERN void *uiGLGetProcAddress(const char* proc);