Compare commits

...

18 commits
v2.6 ... master

Author SHA1 Message Date
Kevin Harrison
5336818494 Fix #62 2025-02-10 19:32:28 -05:00
Kevin Harrison
8d092eefa4 Update Nuklear version to latest 2023-08-27 11:37:31 -04:00
Kevin Harrison
1b8058071e Add key repeat to example 2023-08-27 11:35:54 -04:00
Kevin Harrison
829dc151c0 Replace global lua_State with local arguments 2023-08-27 11:27:51 -04:00
Kevin Harrison
e9be4aa952
Merge pull request #53 from MikuAuahDark/msvc
MSVC tweaks
2020-05-08 14:42:25 -04:00
Kevin Harrison
018aaf60a0 Prevent crash due to not returning value from layout_template_end 2020-05-08 14:41:31 -04:00
Miku AuahDark
0347818eca
Add MSVC build instructions. 2020-05-08 16:57:15 +08:00
Miku AuahDark
640a50532b
MSVC tweaks 2020-05-07 20:44:21 +08:00
Kevin Harrison
9ba37e4e4a
Merge pull request #51 from yannicka/patch-1
Update Nuklear repo URL in README
2020-04-25 17:40:54 -04:00
Yannick A
7491ab58b2
Update Nuklear repo URL in README 2020-04-25 23:35:58 +02:00
Kevin Harrison
d1cfcf2a47
Merge pull request #49 from megagrump/master
Fix typo in nk_love_style_push_progress
2020-04-14 17:44:24 -04:00
Grump
d41e9d1875 fix typo: cusor -> cursor 2020-04-14 09:27:36 +02:00
Kevin Harrison
efc53612bf
Merge pull request #44 from jyscao/readme_update
Add Guix build instruction in README
2019-12-20 09:39:16 -05:00
Jethro Cao
09cdd09716 Add Guix build instruction in README 2019-12-20 17:22:20 +07:00
Kevin Harrison
fef4e00a60
Merge pull request #43 from jyscao/cmake-update
Add install target
2019-12-04 13:04:43 -05:00
Jethro Cao
f33c94db66 Add install target
* this allows `$ make install` to also execute successfully
* without changing the output location of nuklear.so
2019-12-05 00:40:24 +07:00
Kevin Harrison
213be47f91
Merge pull request #42 from jyscao/nuklear-repo-update
Update Nuklear repo URL
2019-12-02 11:03:05 -05:00
Jethro Cao
f7ab5085f1 Update Nuklear repo URL 2019-12-02 14:37:05 +07:00
7 changed files with 721 additions and 668 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
build/

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "src/nuklear"]
path = src/nuklear
url = https://github.com/vurtun/nuklear.git
url = https://github.com/Immediate-Mode-UI/Nuklear.git

View file

@ -24,4 +24,14 @@ TARGET_LINK_LIBRARIES(
${LUA_LIBRARIES}
)
IF(MSVC)
TARGET_COMPILE_DEFINITIONS(${LIB_NAME} PRIVATE LUA_BUILD_AS_DLL)
endif(MSVC)
SET_TARGET_PROPERTIES("${LIB_NAME}" PROPERTIES PREFIX "")
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE PATH "..." FORCE)
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
INSTALL(TARGETS "${LIB_NAME}" DESTINATION .)

View file

@ -1,6 +1,6 @@
# LÖVE-Nuklear
[Nuklear](https://github.com/vurtun/nuklear) module for the [LÖVE](https://love2d.org/) game engine.
[Nuklear](https://github.com/Immediate-Mode-UI/Nuklear) module for the [LÖVE](https://love2d.org/) game engine.
Provides a lightweight immediate mode GUI for LÖVE games.
@ -98,6 +98,13 @@ $ make
```
5. Locate `nuklear.so` in the build folder.
#### Via GNU Guix
LÖVE-Nuklear is also available as a [Guix](http://guix.gnu.org/) package, and can thus be directly downloaded and built via:
```
$ guix package --install love-nuklear
```
### Compiling with CMake and MinGW on Windows
1. Install [CMake](https://cmake.org/download/) and [MinGW](http://mingw.org/) or [MinGW-w64](https://mingw-w64.org/doku.php).
@ -125,6 +132,22 @@ $ mingw32-make
```
18. Locate `nuklear.dll` inside the build folder.
### Compiling with CMake and MSVC on Windows
1. Install [CMake](https://cmake.org/download/) and [Visual Studio](https://visualstudio.microsoft.com/).
Community or Express edition is sufficient.
2. Download the source code for [LuaJIT](http://luajit.org/download.html).
3. Open a Visual Studio Command Prompt (x86 or x64 depending on what architecture you need)
and set the current directory to the LuaJIT folder (the one that contains "README"). Also
remember this path.
4. At the VS Command Prompt, set your current directory to `src` then
execute `msvcbuild.bat`. This will create lua51.dll, lua51.lib, and luajit.exe
5. Now open new command prompt window inside the `love-nuklear` folder.
6. Type `set "LUA_DIR=<path to directory at step 3>"`
7. Then type `cmake -Bbuild -H. -A Win32 -DLUA_INCLUDE_DIR=%LUA_DIR%\src -DLUA_LIBRARY=%LUA_DIR%\src\lua51.lib -DCMAKE_INSTALL_PREFIX=%CD%\install`.
If you previously compile LuaJIT using x64 VS command prompt, replace `Win32` with `x64` at above command.
8. Then type `cmake --build build --config Release --target install` and you'll found `nuklear.dll` inside "install" folder.
## Documentation
A complete description of all functions and style properties, alongside additional examples, is available at the [LÖVE-Nuklear wiki](https://github.com/keharriso/love-nuklear/wiki).

View file

@ -14,6 +14,7 @@ local transform = require 'transform'
local ui1, ui2
function love.load()
love.keyboard.setKeyRepeat(true)
ui1, ui2 = nuklear.newUI(), nuklear.newUI()
end

@ -1 +1 @@
Subproject commit adc52d710fe3c87194b99f540c53e82eb75c2521
Subproject commit 614abce05b9455849bbf1519b7f86e53c78b04ab

File diff suppressed because it is too large Load diff