Skip to content

Commit 97010cb

Browse files
README and LICENSE update.
1 parent d28ece6 commit 97010cb

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ CMakeLists.txt~
4545
# Emacs backup files
4646
*.*~
4747

48-
48+
# build directories
49+
build

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ do use Lua, then you should give us credit by including the appropriate
77
copyright notice somewhere in your product or its documentation. For details,
88
see this.
99

10-
Original Lua source code distribution: Copyright (c) 1994–2023 Lua.org, PUC-Rio.
11-
CMake integration: Copyright (c) 2023 Kritzel Kratzel.
10+
Copyright (c) 1994–2023 Lua.org, PUC-Rio.
11+
Copyright (c) 2023 Kritzel Kratzel.
1212

1313
Permission is hereby granted, free of charge, to any person obtaining a copy of
1414
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Lua with CMake Support
2-
Unaltered [Lua](http://www.lua.org/) source code and documentation with [CMake](https://cmake.org/) infrastructure. This repository contains Lua Version 5.4.6 sources extracted from https://www.lua.org/ftp/lua-5.4.6.tar.gz. Tested generators and architectures are:
2+
Unaltered [Lua](http://www.lua.org/) source code and documentation with [CMake](https://cmake.org/) build infrastructure. This repository contains Lua Version 5.4.6 sources extracted from https://www.lua.org/ftp/lua-5.4.6.tar.gz. Tested generators and architectures are:
33

44
- Visual Studio 17 2022, Win32
55
- Visual Studio 17 2022, x64
66

7+
**Notice:** Present `Makefiles` originate from Lua source code archive and are not used within the context of CMake-based build.
8+
79
## Windows Tool Chain Preparation
810

911
A complete Microsoft Visual Studio Installation is optional but not strictly necessary. Simply install **Buildtools for Visual Studio 2022** from https://visualstudio.microsoft.com/de/downloads/#build-tools-for-visual-studio-2022 and select the following minimum components for download and installation:
@@ -33,11 +35,11 @@ cmake --build . --config Release
3335
cmake --install . --config Release
3436
```
3537

36-
Replace `<arch>` with your desired architecture. Available architectures with selected `Visual Studio 17 2022` generator are `Win32`, `x64`, `ARM` and `ARM64`. Default installation directory is `C:/Apps/lua-5.4.6` where a `GNUInstallDirs` -alike directory structure is created:
38+
Replace `<arch>` with your desired architecture. Available architectures with selected `Visual Studio 17 2022` generator are `Win32`, `x64`, `ARM` and `ARM64`. Default installation directory is `C:/Apps/lua-5.4.6` where a directory structure according to [GNU Coding Standards](https://www.gnu.org/prep/standards/html_node/Directory-Variables.html) is created:
3739

38-
- `bin`: Lua binaries, statically linked, no DLL dependency,
39-
- `include`: Public header files
40-
- `lib`: Lua static library
40+
- `bin`: Lua binaries `lua.exe` and `luac.exe`, both statically linked, no DLL dependency,
41+
- `include`: Public header files,
42+
- `lib`: Lua static library `liblua.lib`,
4143
- `share`: documentation, man-pages, CMake configuration.
4244

4345
The default installation path can be overwritten by using `CMAKE_INSTALL_PREFIX` at the command line during CMake configuration. Example:
@@ -60,11 +62,7 @@ Lua 5.4.6 Copyright (C) 1994-2023 Lua.org, PUC-Rio
6062
> print(_VERSION)
6163
Lua 5.4
6264
>
63-
6465
C:\Users\John Doe>
6566
```
6667

6768

68-
69-
70-

0 commit comments

Comments
 (0)