diff --git a/core/emitter/types.h b/core/emitter/types.h deleted file mode 100644 index 7a958e6ad..000000000 --- a/core/emitter/types.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once - -#if 1 -#include "../types.h" -#else -//basic types -typedef signed __int8 s8; -typedef signed __int16 s16; -typedef signed __int32 s32; -typedef signed __int64 s64; - -typedef unsigned __int8 u8; -typedef unsigned __int16 u16; -typedef unsigned __int32 u32; -typedef unsigned __int64 u64; - -typedef float f32; -typedef double f64; - -#ifdef X86 -typedef u32 unat; -#endif - -#ifdef X64 -typedef u64 unat; -#endif - - -//Do not complain when i use enum::member -#pragma warning( disable : 4482) - -//unnamed struncts/unions -#pragma warning( disable : 4201) - -//unused parameters -#pragma warning( disable : 4100) - -*/ -//basic includes from runtime lib -#include -#include - -#include - -#ifndef dbgbreak -#define dbgbreak __asm {int 3} -#endif - -#ifndef verify -#define verify(x) if((x)==false){ printf("Verify Failed : " #x "\n in %s -> %s : %d \n",__FUNCTION__,__FILE__,__LINE__); dbgbreak;} -#endif - -#ifndef die -#define die(reason) { printf("Fatal error : %s\n in %s -> %s : %d \n",reason,__FUNCTION__,__FILE__,__LINE__); dbgbreak;} -#endif -#endif diff --git a/core/emitter/x86_emitter.cpp b/core/emitter/x86_emitter.cpp index 8a537decd..9b84423e3 100644 --- a/core/emitter/x86_emitter.cpp +++ b/core/emitter/x86_emitter.cpp @@ -3,7 +3,7 @@ #pragma warning(disable:4244) #pragma warning(disable:4245) -#include "../types.h" +#include "types.h" #include "x86_emitter.h" bool IsS8(u32 value) { diff --git a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj index c2fea2a0c..41b1460bc 100644 --- a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj +++ b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj @@ -504,7 +504,6 @@ 84B7BDBC1B72720100F9733F /* generated_class_names_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_class_names_string.h; sourceTree = ""; }; 84B7BDBD1B72720100F9733F /* generated_descriptors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_descriptors.h; sourceTree = ""; }; 84B7BDBE1B72720100F9733F /* generated_indexes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_indexes.h; sourceTree = ""; }; - 84B7BDBF1B72720100F9733F /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = ""; }; 84B7BDC01B72720100F9733F /* x86_emitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = x86_emitter.cpp; sourceTree = ""; }; 84B7BDC11B72720100F9733F /* x86_emitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_emitter.h; sourceTree = ""; }; 84B7BDC21B72720100F9733F /* x86_matcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_matcher.h; sourceTree = ""; }; @@ -1435,7 +1434,6 @@ 84B7BDBC1B72720100F9733F /* generated_class_names_string.h */, 84B7BDBD1B72720100F9733F /* generated_descriptors.h */, 84B7BDBE1B72720100F9733F /* generated_indexes.h */, - 84B7BDBF1B72720100F9733F /* types.h */, 84B7BDC01B72720100F9733F /* x86_emitter.cpp */, 84B7BDC11B72720100F9733F /* x86_emitter.h */, 84B7BDC21B72720100F9733F /* x86_matcher.h */,