prep compile for all platforms

Author: hotbso

Makefile.common

@@ -9,11 +9,9 @@ SOURCES_CPP=airport.cpp coast_map.cpp collect_airports.cpp depth_map.cpp log_msg
 
 SOURCES_C= spng.c http_get.c
 
+GRIB_TEST_OBJS=coast_map.o depth_map.o sub_exec.o grib.o create_snow_png.o spng.o http_get.o
+
 # the c++ standard to use
 CXXSTD=-std=c++20
 
 OPT=-O3
-
-# e.g. -DNDEBUG
-DEBUG=
-

Makefile.lin64

@@ -1,5 +1,4 @@
 OBJDIR=./build/lin
-MYLIB=$(OBJDIR)/libsnow.a
 
 include version.mak
 include Makefile.common
@@ -8,6 +7,7 @@ TARGET=build/lin.xpl
 
 HEADERS=$(wildcard *.h)
 OBJECTS:=$(addprefix $(OBJDIR)/, $(SOURCES_CPP:.cpp=.o)) $(addprefix $(OBJDIR)/, $(SOURCES_C:.c=.o))
+GRIB_TEST_OBJS:=$(addprefix $(OBJDIR)/, $(GRIB_TEST_OBJS))
 
 # all sources to the dep files
 DEPFILES=$(SOURCES_CPP:%.cpp=$(DEPDIR)/%.d) $(SOURCES_C:%.c=$(DEPDIR)/%.d)
@@ -30,7 +30,7 @@ COMPILE.cpp = $(CXX) $(CXXFLAGS) $(DEPFLAGS) -c
 COMPILE.c = $(CC) $(CFLAGS) $(DEPFLAGS) -c
 
 LDFLAGS=-shared -rdynamic -nodefaultlibs -undefined_warning
-LIBS=$(MYLIB) -lcurl -lz
+LIBS=-lcurl -lz -lOpenGL
 
 $(OBJDIR)/%.o: %.cpp $(DEPDIR)/%.d version.mak | $(DEPDIR)
 	$(COMPILE.cpp) -o $@  $<
@@ -40,16 +40,13 @@ $(OBJDIR)/%.o: %.c $(DEPDIR)/%.d version.mak | $(DEPDIR)
 
 all: $(TARGET) grib_test.lin
 
-$(MYLIB): $(OBJECTS)
-	ar cr $@ $^
-
 XPL_DIR=/e/X-Plane-12-test
 
-$(TARGET): $(MYLIB)
-	$(LD) -o $(TARGET) $(OBJDIR)/xa-snow.o $(LIBS) $(LDFLAGS) -lcurl -lz
+$(TARGET): $(OBJECTS)
+	$(LD) -o $(TARGET) $(LDFLAGS) $(OBJECTS) $(LIBS)
 
-grib_test.lin: grib_test.cpp log_msg.cpp $(MYLIB)
-	$(CXX) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp  $(LIBS)
+grib_test.lin: grib_test.cpp log_msg.cpp $(GRIB_TEST_OBJS)
+	$(CXX) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp  $(GRIB_TEST_OBJS) $(LIBS)
 
 $(DEPDIR): ; @mkdir -p $@
 

Makefile.mac64

@@ -7,12 +7,11 @@ TARGET=build/mac.xpl
 TARGET_arm=$(OBJDIR)/mac.xpl_arm
 TARGET_x86=$(OBJDIR)/mac.xpl_x86
 
-MYLIB_arm=$(OBJDIR)/libsnow_arm.a
-MYLIB_x86=$(OBJDIR)/libsnow_x86.a
-
 HEADERS=$(wildcard *.h)
 OBJECTS_arm:=$(addprefix $(OBJDIR)/, $(SOURCES_CPP:.cpp=.o_arm)) $(addprefix $(OBJDIR)/, $(SOURCES_C:.c=.o_arm))
 OBJECTS_x86=$(OBJECTS_arm:.o_arm=.o_x86)
+GRIB_TEST_OBJS_arm:=$(addprefix $(OBJDIR)/, $(GRIB_TEST_OBJS:.o=.o_arm))
+GRIB_TEST_OBJS_x86:=$(addprefix $(OBJDIR)/, $(GRIB_TEST_OBJS:.o=.o_x86))
 
 # all sources to the dep files
 DEPFILES=$(SOURCES_CPP:%.cpp=$(DEPDIR)/%.d) $(SOURCES_C:%.c=$(DEPDIR)/%.d)
@@ -23,19 +22,19 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
 # if we run this script on Linux we it's osxcross 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
-    CCx=clang -target x86_64-apple-macos11
-    CCa=clang -target arm64-apple-macos11
+    CCx=clang -target x86_64-apple-macos13
+    CCa=clang -target arm64-apple-macos13
 
-    CXXx=clang++ -target x86_64-apple-macos11
-    CXXa=clang++ -target arm64-apple-macos11
+    CXXx=clang++ -target x86_64-apple-macos13
+    CXXa=clang++ -target arm64-apple-macos13
     AR=ar
 else
     PATH:=/osxcross/target/bin:$(PATH)
-    CCx=o64-clang -mmacosx-version-min=12.0
-    CCa=oa64-clang -mmacosx-version-min=12.0
+    CCx=o64-clang -mmacosx-version-min=13.0
+    CCa=oa64-clang -mmacosx-version-min=13.0
 
-    CXXx=o64-clang++ -mmacosx-version-min=12.0
-    CXXa=oa64-clang++ -mmacosx-version-min=12.0
+    CXXx=o64-clang++ -mmacosx-version-min=13.0
+    CXXa=oa64-clang++ -mmacosx-version-min=13.0
     AR=llvm-ar
 endif
 
@@ -47,20 +46,14 @@ CXXFLAGS=$(CXXSTD) $(CFLAGS)
 LNFLAGS+=-dynamiclib -shared -rdynamic -fvisibility=hidden -Wl,-exported_symbols_list -Wl,linkscript.mac
 
 # https://pewpewthespells.com/blog/static_and_dynamic_libraries.html
-LIBS= $(MYLIB) -F $(SDK)/Libraries/Mac -framework XPLM -lcurl -lz
+LIBS= -F $(SDK)/Libraries/Mac -framework XPLM -framework OpenGL -lcurl -lz
 
 #test:
 #    $(foreach var,$(.VARIABLES),$(info $(var) = $($(var))))
 
 all: $(TARGET) grib_test.mac
     $(shell [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR))
 
-$(MYLIB_arm): $(OBJECTS_arm)
-	$(AR) cr $@ $^
-
-$(MYLIB_x86): $(OBJECTS_x86)
-	$(AR) cr $@ $^
-
 $(OBJDIR)/%.o_arm: %.cpp version.mak
 	$(CXXa) $(CXXFLAGS) -o $@ -c $<
 
@@ -73,20 +66,20 @@ $(OBJDIR)/%.o_arm: %.c version.mak
 $(OBJDIR)/%.o_x86: %.c  version.mak
 	$(CCx) $(CFLAGS) -o $@ -c $<
 
-$(TARGET_arm): $(MYLIB_arm)
-	$(CXXa) -o $@ $(OBJDIR)/xa-snow.o_arm $(MYLIB_arm) $(LNFLAGS) $(LIBS)
+$(TARGET_arm): $(OBJECTS_arm)
+	$(CXXa) -o $@ $(OBJECTS_arm) $(LNFLAGS) $(LIBS)
 
-$(TARGET_x86): $(MYLIB_x86)
-	$(CXXx) -o $@ $(OBJDIR)/xa-snow.o_x86 $(MYLIB_x86) $(LNFLAGS) $(LIBS)
+$(TARGET_x86): $(OBJECTS_x86)
+	$(CXXx) -o $@ $(OBJECTS_x86) $(LNFLAGS) $(LIBS)
 
 $(TARGET): $(TARGET_arm) $(TARGET_x86)
 	lipo -create -output $@ $(TARGET_arm) $(TARGET_x86)
 
-$(OBJDIR)/grib_test.mac_arm: $(MYLIB_arm) grib_test.cpp log_msg.cpp
-	$(CXXa) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp $(MYLIB_arm) -lcurl -lz
+$(OBJDIR)/grib_test.mac_arm: $(GRIB_TEST_OBJS_arm) grib_test.cpp log_msg.cpp
+	$(CXXa) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp $(GRIB_TEST_OBJS_arm) -lcurl -lz
 
-$(OBJDIR)/grib_test.mac_x86: $(MYLIB_x86) grib_test.cpp log_msg.cpp
-	$(CXXx) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp $(MYLIB_x86) -lcurl -lz
+$(OBJDIR)/grib_test.mac_x86: $(GRIB_TEST_OBJS_x86) grib_test.cpp log_msg.cpp
+	$(CXXx) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp $(GRIB_TEST_OBJS_x86) -lcurl -lz
 
 grib_test.mac: $(OBJDIR)/grib_test.mac_arm $(OBJDIR)/grib_test.mac_x86
 	lipo -create -output $@ $(OBJDIR)/grib_test.mac_arm $(OBJDIR)/grib_test.mac_x86

Makefile.mgw64

@@ -1,5 +1,4 @@
 OBJDIR=./build/win
-MYLIB=$(OBJDIR)/libsnow.a
 
 include version.mak
 include Makefile.common
@@ -8,6 +7,7 @@ TARGET=build/win.xpl
 
 HEADERS=$(wildcard *.h)
 OBJECTS:=$(addprefix $(OBJDIR)/, $(SOURCES_CPP:.cpp=.o)) $(addprefix $(OBJDIR)/, $(SOURCES_C:.c=.o))
+GRIB_TEST_OBJS:=$(addprefix $(OBJDIR)/, $(GRIB_TEST_OBJS))
 
 # all sources to the dep files
 DEPFILES=$(SOURCES_CPP:%.cpp=$(DEPDIR)/%.d) $(SOURCES_C:%.c=$(DEPDIR)/%.d)
@@ -30,7 +30,7 @@ COMPILE.cpp = $(CXX) $(CXXFLAGS) $(DEPFLAGS) -c
 COMPILE.c = $(CC) $(CFLAGS) $(DEPFLAGS) -c
 
 LDFLAGS=-shared -static-libgcc -static -lpthread
-LIBS=$(MYLIB) -L$(SDK)/Libraries/Win -lXPLM_64 -lXPWidgets_64 -lwinhttp -lopengl32 -lz
+LIBS=-L$(SDK)/Libraries/Win -lXPLM_64 -lXPWidgets_64 -lwinhttp -lopengl32 -lz
 
 $(OBJDIR)/%.o: %.cpp $(DEPDIR)/%.d version.mak | $(DEPDIR)
 	$(COMPILE.cpp) -o $@  $<
@@ -40,17 +40,15 @@ $(OBJDIR)/%.o: %.c $(DEPDIR)/%.d version.mak | $(DEPDIR)
 
 all: $(TARGET) grib_test.exe
 
-$(MYLIB): $(OBJECTS)
-	ar cr $@ $^
 
 XPL_DIR=/e/X-Plane-12-test
 
-$(TARGET): $(MYLIB)
-	$(LD) -o $(TARGET) $(OBJDIR)/xa-snow.o $(LIBS) $(LDFLAGS)
+$(TARGET): $(OBJECTS)
+	$(LD) -o $(TARGET) $(OBJECTS) $(LIBS) $(LDFLAGS)
 	if [ -d $(XPL_DIR)/Resources/plugins/XA-snow ]; then cp -p build/win.xpl $(XPL_DIR)/Resources/plugins/XA-snow/.; fi
 
-grib_test.exe: grib_test.cpp log_msg.cpp $(MYLIB)
-	$(CXX) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp  $(MYLIB) -lwinhttp -lz
+grib_test.exe: grib_test.cpp log_msg.cpp $(GRIB_TEST_OBJS)
+	$(CXX) $(CXXFLAGS) -DLOCAL_DEBUGSTRING -o $@ grib_test.cpp log_msg.cpp  $(GRIB_TEST_OBJS) -lwinhttp -lz
 
 $(DEPDIR): ; @mkdir -p $@
 

map_layer.cpp

@@ -33,7 +33,12 @@
 #include "XPLMMap.h"
 #include "XPLMGraphics.h"
 
+#if APL == 1
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 
 #define RGBA(R,G,B) \
     ((150 << 24) | (((B)&0xff) << 16) | (((G)&0xff) << 8) | ((R)&0xff))