Commit 1db04925 authored by nanahira's avatar nanahira

fix

parent 9494a7f8
Pipeline #5208 failed with stages
in 13 minutes and 1 second
...@@ -27,7 +27,7 @@ endif ...@@ -27,7 +27,7 @@ endif
ifeq ($(origin AR), default) ifeq ($(origin AR), default)
AR = ar AR = ar
endif endif
OSX_FLAGS = -mmacosx-version-min=10.9 -arch i386 -arch x86_64 OSX_FLAGS = -mmacosx-version-min=10.9 -arch x86_64
DEFINES += -DUSE_LUA DEFINES += -DUSE_LUA
INCLUDES += -I../../lua INCLUDES += -I../../lua
FORCE_INCLUDE += FORCE_INCLUDE +=
...@@ -214,4 +214,4 @@ $(OBJDIR)/scriptlib.o: ../../ocgcore/scriptlib.cpp ...@@ -214,4 +214,4 @@ $(OBJDIR)/scriptlib.o: ../../ocgcore/scriptlib.cpp
-include $(OBJECTS:%.o=%.d) -include $(OBJECTS:%.o=%.d)
ifneq (,$(PCH)) ifneq (,$(PCH))
-include $(PCH_PLACEHOLDER).d -include $(PCH_PLACEHOLDER).d
endif endif
\ No newline at end of file
...@@ -27,7 +27,7 @@ endif ...@@ -27,7 +27,7 @@ endif
ifeq ($(origin AR), default) ifeq ($(origin AR), default)
AR = ar AR = ar
endif endif
OSX_FLAGS = -mmacosx-version-min=10.9 -arch i386 -arch x86_64 OSX_FLAGS = -mmacosx-version-min=10.9 -arch x86_64
DEFINES += DEFINES +=
INCLUDES += INCLUDES +=
FORCE_INCLUDE += FORCE_INCLUDE +=
...@@ -134,4 +134,4 @@ $(OBJDIR)/sqlite3.o: ../../sqlite3/sqlite3.c ...@@ -134,4 +134,4 @@ $(OBJDIR)/sqlite3.o: ../../sqlite3/sqlite3.c
-include $(OBJECTS:%.o=%.d) -include $(OBJECTS:%.o=%.d)
ifneq (,$(PCH)) ifneq (,$(PCH))
-include $(PCH_PLACEHOLDER).d -include $(PCH_PLACEHOLDER).d
endif endif
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment