| [AD] MacOS X dependency bug fix? |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
The attached patch is an attempt by a non-mac user to fix the compilation
problem due to incorrect dependency detection.
All it does is add pcpu.m to the list of MacOS X specific files, which
actually makes sense to do anyway.
I don't know that the patch actually fixes the problem, but this was the
only thing I could think of that might cause it.
Evert
Index: makefile.lst
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.lst,v
retrieving revision 1.112
diff -u -r1.112 makefile.lst
--- makefile.lst 31 Mar 2005 21:15:56 -0000 1.112
+++ makefile.lst 7 Apr 2005 15:35:20 -0000
@@ -377,6 +377,7 @@
src/macosx/hidjoy.m \
src/macosx/hidman.m \
src/macosx/keybd.m \
+ src/macosx/pcpu.m \
src/macosx/qtmidi.m \
src/macosx/quartz.m \
src/macosx/qzfull.m \
Index: src/c/ccpu.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/c/ccpu.c,v
retrieving revision 1.2
diff -u -r1.2 ccpu.c
--- src/c/ccpu.c 28 Oct 2001 09:52:45 -0000 1.2
+++ src/c/ccpu.c 7 Apr 2005 15:39:53 -0000
@@ -18,7 +18,8 @@
#include "allegro.h"
-
+/* MacOS X has its own check_cpu function, see src/macosx/pcpu.m */
+#ifndef ALLEGRO_MACOSX
/* check_cpu:
* This is the function to call to set the globals.
@@ -30,3 +31,4 @@
cpu_capabilities = 0;
}
+#endif
Index: makefile.osx
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.osx,v
retrieving revision 1.48
diff -u -r1.48 makefile.osx
--- makefile.osx 31 Mar 2005 20:10:32 -0000 1.48
+++ makefile.osx 7 Apr 2005 15:41:33 -0000
@@ -145,8 +145,7 @@
ALLEGRO_SRC_MACOSX_FILES += src/macosx/main.m
endif
-# PH: need to kill including ccpu.o and use pcpu.o instead
-OBJECT_LIST = $(COMMON_OBJECTS) $(subst ccpu,pcpu,$(C_OBJECTS)) $(basename $(notdir $(ALLEGRO_SRC_MACOSX_FILES)))
+OBJECT_LIST = $(COMMON_OBJECTS) $(C_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_MACOSX_FILES)))
STATIC_LIBRARIES = -framework Cocoa -framework Carbon -framework IOKit -framework System -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework QuickTime
ifdef STATICLINK