From 6c288ecb6ff2a79657d90ee62421eca00bceaf03 Mon Sep 17 00:00:00 2001 From: Matthew Kilgore Date: Fri, 25 Nov 2022 01:00:20 -0500 Subject: [PATCH] Don't compile libqb.cpp as Objective-C on Mac OS With the recent changes to libqb.cpp to pull out some of the GLUT logic, the only actual Objective-C in libqb.cpp was pulled out. That being the case, it's no longer necessary to have libqb.mm for compiling libqb.cpp, so we're removing it to simplify the compliation logic a bit. --- Makefile | 5 ----- internal/c/libqb.cpp | 6 ------ internal/c/libqb.mm | 2 -- 3 files changed, 13 deletions(-) delete mode 100644 internal/c/libqb.mm diff --git a/Makefile b/Makefile index c9b02292b..f47b3b665 100644 --- a/Makefile +++ b/Makefile @@ -401,13 +401,8 @@ endif QBLIB := $(PATH_INTERNAL_C)/$(QBLIB_NAME).o -ifneq ($(OS),osx) $(QBLIB): $(PATH_INTERNAL_C)/libqb.cpp $(CXX) $(CXXFLAGS) $< -c -o $@ -else -$(QBLIB): $(PATH_INTERNAL_C)/libqb.mm - $(CXX) $(CXXFLAGS) $< -c -o $@ -endif ifeq ($(OS),win) CLEAN_LIST += $(ICON_OBJ) diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp index e20f40a8f..0effb84f2 100644 --- a/internal/c/libqb.cpp +++ b/internal/c/libqb.cpp @@ -13,13 +13,7 @@ #ifdef QB64_MACOSX # include -# include "Cocoa/Cocoa.h" -# include -# include -# include - # include //required for _NSGetExecutablePath - #endif #include "mutex.h" diff --git a/internal/c/libqb.mm b/internal/c/libqb.mm deleted file mode 100644 index 59eae3f8c..000000000 --- a/internal/c/libqb.mm +++ /dev/null @@ -1,2 +0,0 @@ -#include "libqb.cpp" -