1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-04 06:00:23 +00:00

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.
This commit is contained in:
Matthew Kilgore 2022-11-25 01:00:20 -05:00
parent 72193e34e5
commit 6c288ecb6f
3 changed files with 0 additions and 13 deletions

View file

@ -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)

View file

@ -13,13 +13,7 @@
#ifdef QB64_MACOSX
# include <ApplicationServices/ApplicationServices.h>
# include "Cocoa/Cocoa.h"
# include <CoreFoundation/CoreFoundation.h>
# include <objc/objc-runtime.h>
# include <objc/objc.h>
# include <mach-o/dyld.h> //required for _NSGetExecutablePath
#endif
#include "mutex.h"

View file

@ -1,2 +0,0 @@
#include "libqb.cpp"