Skip to content

Commit

Permalink
m68k: Added AmiSSL 4.4 and Posix Lib includes
Browse files Browse the repository at this point in the history
  • Loading branch information
walkero-gr committed Mar 2, 2020
1 parent afc3fb6 commit db9cf9a
Show file tree
Hide file tree
Showing 6 changed files with 453 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file.

## docker4amigavbcc:1.2-m68k - 2020-03-02
### Added
- AmiSSL 4.4 SDK
- Posix Lib includes

## docker4amigavbcc:1.1-ppc - 2020-02-28
### Added
- AmiSSL 4.4 SDK
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ The **docker4amigavbcc:latest-m68k** image contains the following:
| MCC_GuiGfx | 19.2 | http://aminet.net/package/dev/mui/MCC_Guigfx
| MCC_TextEditor | 15.53 | http://aminet.net/package/dev/mui/MCC_TextEditor-15.53
| Roadshow SDK | 1.4 (15.3.2019) | https://www.amigafuture.de/app.php/dlext/?view=detail&df_id=3658
| AmiSSL SDK | 4.4 | https://github.com/jens-maus/amissl/releases/tag/4.4
| Posix Lib | 2.6 | http://aminet.net/package/dev/c/vbcc_PosixLib

## PPC development image
The **docker4amigavbcc:latest-ppc** image contains the following:
Expand Down Expand Up @@ -77,6 +79,8 @@ The **docker4amigavbcc:latest-m68k** image has the following ENV variables set:
* **MUI50_INC**: /opt/sdk/MUI_5.0/C/include
* **TCP_INC**: /opt/sdk/Roadshow-SDK/include
* **NET_INC**: /opt/sdk/Roadshow-SDK/netinclude
* **AMISSL_INC**: /opt/sdk/AmiSSL/include
* **POSIXLIB_INC**: /opt/sdk/PosixLib/include

The **docker4amigavbcc:latest-ppc** image has the following ENV variables set:

Expand All @@ -86,6 +90,7 @@ The **docker4amigavbcc:latest-ppc** image has the following ENV variables set:
* **AOS4_NET_INC**: /opt/sdk/ppc-amigaos/Include/netinclude
* **AOS4_NLIB_INC**: /opt/sdk/ppc-amigaos/newlib/include
* **MUI50_INC**: /opt/sdk/MUI_5.0/C/include
* **AMISSL_INC**: /opt/sdk/AmiSSL/include

You can set your own paths, if you want, by using environment variables on docker execution or inside the docker-compose.yml file, like:
```bash
Expand Down
20 changes: 15 additions & 5 deletions code/aosppc/https.c
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
/*
* This code is from AmiSSL github repo
* https://github.com/jens-maus/amissl/blob/4.4/test/https.c
*
* Compile with
* vc +aosppc -I$AOS4_SDK_INC -I$AOS4_NET_INC -I$AOS4_NLIB_INC -I$AMISSL_INC -D__USE_INLINE__ -lauto https.c -o https
*/

#include <sys/types.h>
#if defined(__amigaos4__)
#ifndef __USE_BASETYPE__
#define __USE_BASETYPE__
#endif
#ifndef __USE_INLINE__
#define __USE_INLINE__
#endif
#ifndef __NEW_TIMEVAL_DEFINITION_USED__
#define __NEW_TIMEVAL_DEFINITION_USED__
#endif
#endif /* __amigaos4__ */

#include <sys/socket.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <dos/dos.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
Expand Down
Loading

0 comments on commit db9cf9a

Please sign in to comment.