Merge branch 'master' of https://gitea.pep.foundation/pEp.foundation/pEpEngine

# Conflicts:
#	build-windows/generate_code.cmd

Makefile.conf

@@ -87,6 +87,7 @@ endif
 # Are we wiping this on purpose?
 LDLIBS=
 
+# Define compiler.
 ifeq ($(BUILD_FOR),OS/390)
     CC=xlclang
 else ifeq ($(BUILD_FOR),Linux)
@@ -95,6 +96,16 @@ else ifeq ($(BUILD_FOR),Darwin)
     CC=clang 
 endif
 
+# Define platform-identification feature macros.
+ifeq ($(BUILD_FOR),Linux)
+    CPPFLAGS+= -DUNIX 
+else ifeq ($(BUILD_FOR),Darwin)
+    CPPFLAGS+= -DUNIX -DDARWIN 
+else ifeq ($(BUILD_FOR),OS/390)
+    CPPFLAGS+= -DZOS 
+endif
+
+# Add platform-specific compilation options.
 ifeq ($(BUILD_FOR),OS/390)
     CFLAGS= -Wno-gnu-include-next -qnosearch -I$(HERE) -I.
     CFLAGS+= -I/usr/include

build-windows/generate_code.cmd

@@ -17,6 +17,9 @@ IF NOT EXIST "%ProgramData%\pEp" "MKDIR %ProgramData%\pEp"
 DEL "%ProgramData%\pEp\system.db"
 MOVE system.db "%ProgramData%\pEp\system.db"
 
+:: Generate code in ...\pEpEngine\codegen
+CD ..\codegen
+
 :: Make sure YML2 is installed
 PY -m pip install --upgrade pip
 PY -m pip install wheel