Skip to content

Commit

Permalink
++
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilipDeegan committed Jun 16, 2024
1 parent 6ef0e96 commit 960a5b7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
bin
ext/pugixml/bin
ext/pugixml/trunk
ext/sparsehash
.mkn
bin
conanbuildinfo.txt
conaninfo.txt
conan*
build
deactivate*
5 changes: 5 additions & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
[requires]
openssl/3.2.2
[generators]
CMakeDeps
CMakeToolchain
[layout]
cmake_layout
14 changes: 8 additions & 6 deletions mkn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,27 @@ profile:
if_lib:
nix: ssl crypto
bsd: ssl crypto
win: User32 Crypt32 libssl libcrypto
win: User32 Crypt32 libssl libcrypto zlib
if_link:
win_cl: -nodefaultlib:libucrt.lib ucrt.lib

- name: fcgi
parent: lib
arg: -D_KUL_INCLUDE_FCGI_

- name: usage
self: https
parent: https
main: test/usage.cpp
arg: -D_MKN_RAM_INCLUDE_HTTPS_
if_link:
win_cl: -nodefaultlib:libucrt.lib ucrt.lib
# arg: -D_MKN_RAM_INCLUDE_HTTPS_
# if_link:
# win_cl: -nodefaultlib:libucrt.lib ucrt.lib

- name: test_fcgi
main: test/fcgi.cpp
self: fcgi

- name: test
self: https
parent: https
mode: none
main: test/test.cpp

Expand Down
2 changes: 1 addition & 1 deletion test/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#define _MKN_RAM_INCLUDE_HTTPS_
// #define _MKN_RAM_INCLUDE_HTTPS_
#define __MKN_RAM_NOMAIN__
#include "usage.cpp"
class TestHTTPSServer : public mkn::ram::https::Server {
Expand Down

0 comments on commit 960a5b7

Please sign in to comment.