leifo · alkama · Feb 15, 2019 · Feb 15, 2019 · Feb 15, 2019 · Feb 16, 2019
diff --git a/demo/hellodemo/build/makefile b/demo/hellodemo/build/makefile
@@ -38,7 +38,7 @@ VPATH = $(SRCDIR)
 #vpath %.asm src
 
 CFLAGS = -O=23999 -cpu=68060 -fpu=68060 -DAMIGA -speed -c99 -k -DSYNC_PLAYER -DNEED_STRDUP
-ASFLAGS = -Fhunk -m68020 -m68882 -Ic:/vbcc/NDK39/Include/include_i 
+ASFLAGS = -Fhunk -m68020 -m68882 -I$(VBCC)/NDK39/Include/include_i 
 LDFLAGS =
 
 INCDIR = ../../shared
@@ -59,8 +59,8 @@ LD       = vlink
 # Add includes and libraries.
 #INCDIR   := $(INCDIR) ./ "$(VBCC)/posix/include" "$(VBCC)/targets/m68k-amigaos/include"
 #LIBDIR   := $(LIBDIR) ./ "$(VBCC)/targets/m68k-amigaos/lib"
-INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(INCDIR) ./ 
-LIBDIR   := C:\\VBCC/targets/m68k-amigaos/lib
+INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(VBCC)/NDK39/Include/include_h $(INCDIR) ./ 
+LIBDIR   := $(VBCC)/targets/m68k-amigaos/lib
 
 # Strip everything if there's no d
10000
ebug infos
 ifeq ($(findstring -g, $(CFLAGS)), -g)

diff --git a/demo/hellodemo/hellodemo.pro b/demo/hellodemo/hellodemo.pro
@@ -12,6 +12,8 @@ CONFIG += console
 OBJECTS_DIR=.obj
 MOC_DIR=.moc
 
+DEFINES += WOS_ON_PC=1
+
 win32 {
    DEFINES += _USE_MATH_DEFINES=1
    DEFINES += _CRT_SECURE_NO_WARNINGS=1
@@ -62,7 +64,6 @@ HEADERS += \
 SOURCES += \
     src/main.c \
     src/stars/starseffect.c \
-    src/main.c \
     src/movetable/movetableeffect.c \
     src/pictures/pictureeffect.c
 

diff --git a/demo/hellodemo/src/main.c b/demo/hellodemo/src/main.c
@@ -378,7 +378,7 @@ void mainDemo()
    // 23: 220x180x12
    // 24: 320x180x5 (OCS)
 
-#if !defined (WIN32) && !defined(linux)
+#if !defined (WOS_ON_PC) && !defined (WIN32) && !defined(linux)
    g_vbitimer+=0 ;//66*50;
    while (wosCheckExit()==0)
    {

diff --git a/demo/hellodemo/src/movetable/movetableeffect.h b/demo/hellodemo/src/movetable/movetableeffect.h
@@ -2,7 +2,7 @@
 #define MOVETABLEEFFECT_H
 
 void movetableEffectInit();
-void movetableEffectOn(time);
+void movetableEffectOn(int time);
 void movetableEffectRender(int time, int xtab, int ytab);
 void movetableEffectRelease();
 unsigned int* movetablePalette();

diff --git a/demo/hellodemo/src/stars/starseffect.h b/demo/hellodemo/src/stars/starseffect.h
@@ -1,5 +1,5 @@
 #ifndef STARSEFFECT_H
-#define STARSFFECT_H
+#define STARSEFFECT_H
 
 void starsEffectInit();
 void starsEffectOn(int startTime);

diff --git a/demo/movetable/build/makefile b/demo/movetable/build/makefile
@@ -58,8 +58,8 @@ LD       = vlink
 # Add includes and libraries.
 #INCDIR   := $(INCDIR) ./ "$(VBCC)/posix/include" "$(VBCC)/targets/m68k-amigaos/include"
 #LIBDIR   := $(LIBDIR) ./ "$(VBCC)/targets/m68k-amigaos/lib"
-INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(INCDIR) ./ 
-LIBDIR   := C:\\VBCC/targets/m68k-amigaos/lib
+INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(VBCC)/NDK39/Include/include_h $(INCDIR) ./ 
+LIBDIR   := $(VBCC)/targets/m68k-amigaos/lib
 
 # Strip everything if there's no debug infos
 ifeq ($(findstring -g, $(CFLAGS)), -g)

diff --git a/demo/movetable/movetable.pro b/demo/movetable/movetable.pro
@@ -19,6 +19,8 @@ MOC_DIR=.moc
 #MOC_DIR=R:/moc
 #PRECOMPILED_DIR=R:\
 
+DEFINES += WOS_ON_PC=1
+
 win32 {
    DEFINES += _USE_MATH_DEFINES=1
    DEFINES += _CRT_SECURE_NO_WARNINGS=1
@@ -34,15 +36,16 @@ INCLUDEPATH += $$(QTDIR)/include/QtGui
 INCLUDEPATH += $$(QTDIR)/include/QtNetwork
 INCLUDEPATH += $$(QTDIR)/include/QtOpenGL
 
-LIBS += -lopengl32
+win32 {
+   LIBS += -lopengl32
+}
 
 OTHER_FILES += \
     build/makefile
 
 # source
 
 HEADERS += \
-    src/vertex.h \
     src/movetableeffect.h \
     ../shared/math/imath.h \
     ../shared/image/tga.h

diff --git a/demo/movetable/src/main.c b/demo/movetable/src/main.c
@@ -38,7 +38,7 @@ void mainDemo()
 
    wosSetMode(8, screenBuffer, movetablePalette(), 256);
 
-#ifndef WIN32
+#ifndef WOS_ON_PC
    while (wosCheckExit()==0)
    {
       time= g_vbitimer;

diff --git a/demo/picture/build/makefile b/demo/picture/build/makefile
@@ -52,8 +52,8 @@ LD       = vlink
 # Add includes and libraries.
 #INCDIR   := $(INCDIR) ./ "$(VBCC)/posix/include" "$(VBCC)/targets/m68k-amigaos/include"
 #LIBDIR   := $(LIBDIR) ./ "$(VBCC)/targets/m68k-amigaos/lib"
-INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(INCDIR) ./ 
-LIBDIR   := C:\\VBCC/targets/m68k-amigaos/lib
+INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(VBCC)/NDK39/Include/include_h $(INCDIR) ./ 
+LIBDIR   := $(VBCC)/targets/m68k-amigaos/lib
 
 # Strip everything if there's no debug infos
 ifeq ($(findstring -g, $(CFLAGS)), -g)

diff --git a/demo/picture/picture.pro b/demo/picture/picture.pro
@@ -19,6 +19,8 @@ MOC_DIR=.moc
 #MOC_DIR=R:/moc
 #PRECOMPILED_DIR=R:\
 
+DEFINES += WOS_ON_PC=1
+
 win32 {
    DEFINES += _USE_MATH_DEFINES=1
    DEFINES += _CRT_SECURE_NO_WARNINGS=1
@@ -34,7 +36,9 @@ INCLUDEPATH += $$(QTDIR)/include/QtGui
 INCLUDEPATH += $$(QTDIR)/include/QtNetwork
 INCLUDEPATH += $$(QTDIR)/include/QtOpenGL
 
-LIBS += -lopengl32
+win32 {
+   LIBS += -lopengl32
+}
 
 OTHER_FILES += \
     build/makefile

diff --git a/demo/picture/src/main.c b/demo/picture/src/main.c
@@ -41,7 +41,7 @@ void mainDemo()
    int time= 0;
 
    wosSetMode(8, screenBuffer, g_currentPal, 0);
-#ifndef WIN32
+#ifndef WOS_ON_PC
    while (wosCheckExit()==0)
    {
       time= g_vbitimer;

diff --git a/demo/screenmodes/build/makefile b/demo/screenmodes/build/makefile
@@ -32,7 +32,7 @@ VPATH = $(SRCDIR)
 #vpath %.c src
 #vpath %.asm src
 
-CFLAGS = -O=23999 -cpu=68060 -fpu=68060 -DAMIGA -speed -k
+CFLAGS = -O=23999 -cpu=68060 -fpu=68060 -DAMIGA -c99 -speed -k
 ASFLAGS =
 LDFLAGS =
 
@@ -54,8 +54,8 @@ LD       = vlink
 # Add includes and libraries.
 #INCDIR   := $(INCDIR) ./ "$(VBCC)/posix/include" "$(VBCC)/targets/m68k-amigaos/include"
 #LIBDIR   := $(LIBDIR) ./ "$(VBCC)/targets/m68k-amigaos/lib"
-INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(INCDIR) ./ 
-LIBDIR   := C:\\VBCC/targets/m68k-amigaos/lib
+INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(VBCC)/NDK39/Include/include_h $(INCDIR) ./ 
+LIBDIR   := $(VBCC)/targets/m68k-amigaos/lib
 
 # Strip everything if there's no debug infos
 ifeq ($(findstring -g, $(CFLAGS)), -g)

diff --git a/demo/screenmodes/screenmodes.pro b/demo/screenmodes/screenmodes.pro
@@ -19,6 +19,8 @@ MOC_DIR=.moc
 #MOC_DIR=R:/moc
 #PRECOMPILED_DIR=R:\
 
+DEFINES += WOS_ON_PC=1
+
 win32 {
    DEFINES += _USE_MATH_DEFINES=1
    DEFINES += _CRT_SECURE_NO_WARNINGS=1
@@ -34,7 +36,9 @@ INCLUDEPATH += $$(QTDIR)/include/QtGui
 INCLUDEPATH += $$(QTDIR)/include/QtNetwork
 INCLUDEPATH += $$(QTDIR)/include/QtOpenGL
 
-LIBS += -lopengl32
+win32 {
+    LIBS += -lopengl32
+}
 
 OTHER_FILES += \
     build/makefile

diff --git a/demo/screenmodes/src/main.c b/demo/screenmodes/src/main.c
@@ -86,7 +86,7 @@ void mainDemo()
    int time= 0;
 
    //wosSetMode(8, screenBuffer, g_currentPal, 256);
-#ifndef WIN32
+#ifndef WOS_ON_PC
    while (wosCheckExit()==0)
    {
       time= g_vbitimer;

diff --git a/demo/shared/tools/malloc.h b/demo/shared/tools/malloc.h
@@ -13,7 +13,10 @@
 
 // windows
 #include <stdlib.h>
+
+#if defined (WIN32) || defined(linux)
 #include <malloc.h>
+#endif
 
 #endif
 

diff --git a/demo/shared/tools/mem32.h b/demo/shared/tools/mem32.h
@@ -3,7 +3,7 @@
 
 #include "math/imath.h"
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__APPLE__)
 #include <memory.h>
 #endif
 

diff --git a/demo/shared/wos/wos.cpp b/demo/shared/wos/wos.cpp
@@ -462,9 +462,9 @@ WosQt::~WosQt()
 
    waveOutReset(mHandle);
    waveOutClose(mHandle);
-#endif
 
    delete[] mAudioBuffer;
+#endif
 }
 
 void SetupHam15Bit(unsigned int* bp0, unsigned int* bp1, int rows)

diff --git a/demo/stars/build/makefile b/demo/stars/build/makefile
@@ -56,8 +56,8 @@ LD       = vlink
 # Add includes and libraries.
 #INCDIR   := $(INCDIR) ./ "$(VBCC)/posix/include" "$(VBCC)/targets/m68k-amigaos/include"
 #LIBDIR   := $(LIBDIR) ./ "$(VBCC)/targets/m68k-amigaos/lib"
-INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(INCDIR) ./ 
-LIBDIR   := C:\\VBCC/targets/m68k-amigaos/lib
+INCDIR   := $(VBCC)/posix/include $(VBCC)/targets/m68k-amigaos/include $(VBCC)/NDK39/Include/include_h $(INCDIR) ./ 
+LIBDIR   := $(VBCC)/targets/m68k-amigaos/lib
 
 # Strip everything if there's no debug infos
 ifeq ($(findstring -g, $(CFLAGS)), -g)

diff --git a/demo/stars/src/main.c b/demo/stars/src/main.c
@@ -38,7 +38,7 @@ void mainDemo()
 
    wosSetMode(8, screenBuffer, starsPalette(), 256);
 
-#ifndef WIN32
+#ifndef WOS_ON_PC
    while (wosCheckExit()==0)
    {
       time= g_vbitimer;

diff --git a/demo/stars/src/starseffect.h b/demo/stars/src/starseffect.h
@@ -1,5 +1,5 @@
 #ifndef STARSEFFECT_H
-#define STARSFFECT_H
+#define STARSEFFECT_H
 
 void starsInit();
 void starsRender(int time);

diff --git a/demo/stars/stars.pro b/demo/stars/stars.pro
@@ -19,6 +19,8 @@ MOC_DIR=.moc
 #MOC_DIR=R:/moc
 #PRECOMPILED_DIR=R:\
 
+DEFINES += WOS_ON_PC=1
+
 win32 {
    DEFINES += _USE_MATH_DEFINES=1
    DEFINES += _CRT_SECURE_NO_WARNINGS=1
@@ -34,15 +36,16 @@ INCLUDEPATH += $$(QTDIR)/include/QtGui
 INCLUDEPATH += $$(QTDIR)/include/QtNetwork
 INCLUDEPATH += $$(QTDIR)/include/QtOpenGL
 
-LIBS += -lopengl32
+win32 {
+    LIBS += -lopengl32
+}
 
 OTHER_FILES += \
     build/makefile
 
 # source
 
 HEADERS += \
-    src/vertex.h \
     src/starseffect.h \
 
 SOURCES += \

diff --git a/readme.macos.md b/readme.macos.md
@@ -0,0 +1,49 @@
+# Quick guide to install and use the Haujobb Amiga Framework on macOS
+
+## Download:
+
+### To Crosscompile with makefiles you need 3 files:
+* (1) VBCC Binary for macOS and (2) the target m68k-amigaos
+    * http://sun.hasenbraten.de/vbcc/
+* (3) the NDK 3.9
+    * http://www.haage-partner.de/download/AmigaOS/NDK39.lha
+
+### Misc utilities:
+* To easily decompress lha files and tons of other archives, you can use Keka
+    * https://www.keka.io/en/
+
+## Install:
+* Choose a directory for
C5B7
 the toolchain
+* Extract the VBCC binaries, target and NDK39 there, the layout should be:
+```
+./toolchain
+├── bin
+│   └── ...
+├── config
+│   ├── aos68k
+│   ├── aos68km
+│   ├── aos68kr
+│   └── vc.config (<<< see below)
+├── NDK39
+│   ├── Documentation
+│   ├── Examples
+│   ├── Include
+│   └── ...
+└── targets
+    └── m68k-amigaos
+        └── ...
+```
+* make a `config/vc.config` by copying the `aos68k` file and replace all occurences of:
+    * `vincludeos3:` by `$VBCC/targets/m68k-amigaos/include`
+    * `vlibos3:` by `$VBCC/targets/m68k-amigaos/lib/`
+    * the `-rm=delete quiet %s` line by `-rm=rm -f %s`
+    * the `-rmv=delete %s` line by `-rmv=rm %s`
+
+* setup the `$VBCC` environment variable, pointing to your chosen toolchain folder, in your user profile (`.profile` or `.bashrc` or `.zshrc` or whatever your shell is)
+```
+export VBCC=[PATH TO YOUR VBCC TOOLCHAIN FOLDER OF CHOICE]
+```
+
+You should now be able to compile any example by running `make` in their respective "build" folder
+
+For the rest of the usages, please refer to the main documentation
diff --git a/wos/makefile b/wos/makefile
@@ -1,6 +1,6 @@
 AS = vasmm68k_mot
 
-ASFLAGS = -Fhunk -m68020 -m68882 -Ic:/vbcc/NDK39/Include/include_i 
+ASFLAGS = -Fhunk -m68020 -m68882 -I$(VBCC)/NDK39/Include/include_i 
 
 all:	subdir wickedlink.o wickedquicklink.o wostest