diff --git a/common/JackAtomic.h b/common/JackAtomic.h index 4b8326ad..19ea209f 100644 --- a/common/JackAtomic.h +++ b/common/JackAtomic.h @@ -22,24 +22,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "JackTypes.h" -/* -typedef unsigned short UInt16; -#if __LP64__ -typedef unsigned int UInt32; -typedef signed int SInt32; -#else -typedef unsigned long UInt32; -typedef signed long SInt32; -#endif - -#ifdef WIN32 -#include -typedef ULONGLONG UInt64; -#else -typedef unsigned long long UInt64; -#endif -*/ - #if defined(__APPLE__) #if defined(__ppc__) || defined(__ppc64__) diff --git a/common/JackConstants.h b/common/JackConstants.h index 45df3be3..562830f3 100644 --- a/common/JackConstants.h +++ b/common/JackConstants.h @@ -85,15 +85,6 @@ namespace Jack typedef uint16_t jack_int_t; // Internal type for ports and refnum -/* -typedef enum { - NotTriggered, - Triggered, - Running, - Finished, -} jack_client_state_t; -*/ - } // end of namespace #endif diff --git a/common/JackTypes.h b/common/JackTypes.h index 214b9ee1..a35d2006 100644 --- a/common/JackTypes.h +++ b/common/JackTypes.h @@ -37,7 +37,6 @@ typedef ULONGLONG UInt64; typedef unsigned long long UInt64; #endif - namespace Jack { diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 54b866a3..754d5f25 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -5213,7 +5213,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jack-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OPTIMIZATION_CFLAGS = "-O0"; @@ -5274,7 +5274,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jack-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -5328,7 +5328,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jack-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( @@ -5388,7 +5388,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jack-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OPTIMIZATION_CFLAGS = "-O0"; @@ -5450,7 +5450,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jack-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -5505,7 +5505,7 @@ RPC, ../common/jack, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jack-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; OTHER_CFLAGS = ( @@ -5562,7 +5562,7 @@ ../common/jack, ../common, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jackwrapper-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", @@ -5597,7 +5597,7 @@ ../common/jack, ../common, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jackwrapper-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_LDFLAGS = ( @@ -5631,7 +5631,7 @@ ../common/jack, ../common, ); - INFOPLIST_FILE = "/Volumes/Document1/Developpement/ProjectsCVS/JackCVS/jackmp-svn/trunk/jackmp 64bits/macosx/Jackwrapper-Info.plist"; + INFOPLIST_FILE = "Jack-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", @@ -8593,8 +8593,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ( - ppc, i386, + ppc, ); COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; @@ -8651,8 +8651,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ( - ppc, i386, + ppc, ); COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; @@ -8710,8 +8710,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ( - ppc, i386, + ppc, ); DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1;