Commits

Anonymous committed bea9505

Makefile patches

  • Participants
  • Parent commits f60f86b

Comments (0)

Files changed (3)

File Glitch64/Makefile.gcc

 LDLIBS += -lGL
 endif
 
+ifeq ($(OSX_ARCH), i386)
+CFLAGS += -arch i386
+LDFLAGS += -arch i386
+endif
+
 RM = rm
 
 SOURCES = \

File src/Makefile.nowx-gcc

 .PHONY: all clean realclean ostype
 
 OS=$(shell uname)
+
+DLLNAME = Glide64.so
+
 ifeq ($(findstring MINGW,$(OS)),MINGW)
 OS := WINDOWS
+DLLNAME = Glide64.dll
 endif
+
 ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
 OS=WINDOWS
+DLLNAME = Glide64.dll
 endif
+
 ifeq ($(findstring WINNT,$(OS)),WINNT)
 OS=WINDOWS
+DLLNAME = Glide64.dll
 endif
+
 ifeq ($(OS),Darwin)
 OS=MACOSX
-endif
-
-ifeq ($(OS), WINDOWS)
-DLLNAME = Glide64.dll
-else
-DLLNAME = Glide64.so
+DLLNAME = Glide64.dylib
 endif
 
 EXT_INC = ./inc
 CFLAGS += -DBUILDING_DLL=1  -fexceptions -I$(MPAPI_PATH) -fPIC -DPIC #-DNOSSE -fPIC -DPIC -O0
 LDLIBS = -L"." -L"lib"
 
+ifeq ($(OSX_ARCH), i386)
+CFLAGS += -arch i386 -DNO_ASM=1
+LDFLAGS += -arch i386
+endif
+
 ifeq ($(OS), Linux)
 LDFLAGS += -shared -lstdc++ 
 CFLAGS += -D__unix__
 extern wxUint32 frame_count; // frame counter
 
 //GlideHQ support
-
-#define TEXTURE_FILTER
+#warning GlideHQ Disabled!
+// #define TEXTURE_FILTER
 
 #ifdef TEXTURE_FILTER
 #include "Ext_TxFilter.h"