Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-12 16:30:44 +00:00
Code Issues Projects Releases Wiki Activity

libgenemu can't find regflags in the XCode built newcpu.o,

Browse Source 
so we compile it from the makefile into the lib, and not in the project
This commit is contained in:
nigel 2006-05-25 05:03:03 +00:00
parent d9eb35f026
commit c071cd14f6
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
BasiliskII/src/MacOSX/BasiliskII.xcode/project.pbxproj
View File

@ -244,7 +244,7 @@
HEADER_SEARCH_PATHS = "../include ../uae_cpu ../Unix ../slirp";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = ".";
LIBRARY_SEARCH_PATHS = .;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = BasiliskII;
@ -282,7 +282,6 @@
A68501E905C4EEF200DDBA94,
A68501EA05C4EEF200DDBA94,
A68501EC05C4EEF200DDBA94,
A68501EE05C4EEF200DDBA94,
A68501F005C4EEF200DDBA94,
A685020D05C4EF6700DDBA94,
);
@ -339,7 +338,6 @@
A68501C205C4ED0700DDBA94,
A68501E805C4EEF200DDBA94,
A68501EB05C4EEF200DDBA94,
A68501ED05C4EEF200DDBA94,
A68501EF05C4EEF200DDBA94,
A68501F305C4EF3300DDBA94,
A685020305C4EF6700DDBA94,
@ -1036,8 +1034,6 @@
A68501E105C4EEF200DDBA94,
A68501E205C4EEF200DDBA94,
A68501E305C4EEF200DDBA94,
A68501E405C4EEF200DDBA94,
A68501E505C4EEF200DDBA94,
A68501E605C4EEF200DDBA94,
A68501E705C4EEF200DDBA94,
);
@ -1137,24 +1133,6 @@
refType = 2;
sourceTree = SOURCE_ROOT;
};
A68501E405C4EEF200DDBA94 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.cpp;
name = newcpu.cpp;
path = ../uae_cpu/newcpu.cpp;
refType = 2;
sourceTree = SOURCE_ROOT;
};
A68501E505C4EEF200DDBA94 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = newcpu.h;
path = ../uae_cpu/newcpu.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
A68501E605C4EEF200DDBA94 = {
fileEncoding = 30;
isa = PBXFileReference;
@ -1203,18 +1181,6 @@
settings = {
};
};
A68501ED05C4EEF200DDBA94 = {
fileRef = A68501E405C4EEF200DDBA94;
isa = PBXBuildFile;
settings = {
};
};
A68501EE05C4EEF200DDBA94 = {
fileRef = A68501E505C4EEF200DDBA94;
isa = PBXBuildFile;
settings = {
};
};
A68501EF05C4EEF200DDBA94 = {
fileRef = A68501E605C4EEF200DDBA94;
isa = PBXBuildFile;

5
BasiliskII/src/MacOSX/Makefile.in
View File

@ -143,7 +143,10 @@ cpuemu.s: cpuemu.cpp
$(EMU_OBJ) : build/%.o : %.cpp
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
$(EMU_LIB) : $(EMU_OBJ)
build/newcpu.o : ../uae_cpu/newcpu.cpp
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
$(EMU_LIB) : $(EMU_OBJ) build/newcpu.o
libtool -static -o $@ $^
$(SLIRP_OBJ) : build/%.o : ../slirp/%.c