diff --git a/polymer/build/osx/engine/engine.xcode/project.pbxproj b/polymer/build/osx/engine/engine.xcode/project.pbxproj deleted file mode 100644 index 444e8d545..000000000 --- a/polymer/build/osx/engine/engine.xcode/project.pbxproj +++ /dev/null @@ -1,1539 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 39; - objects = { - AB2B5C7308E6979600899067 = { - buildPhases = ( - AB2B5C7408E6979600899067, - AB2B5C7508E6979600899067, - AB2B5C8408E6979600899067, - AB2B5C9608E6979600899067, - ); - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PREPROCESSOR_DEFINITIONS = "SETSPRITEZ SUPERBUILD POLYMOST USE_OPENGL USE_A_C NOASM RENDERTYPESDL=1 KSFORBUILD WITHKPLIB"; - HEADER_SEARCH_PATHS = "../../include ../../src"; - LIBRARY_STYLE = STATIC; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = enginez; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas -Wno-char-subscripts"; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = enginez; - productName = engine; - productReference = AB2B5C9708E6979600899067; - productType = "com.apple.product-type.library.static"; - }; - AB2B5C7408E6979600899067 = { - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - isa = PBXShellScriptBuildPhase; - outputPaths = ( - engineinfo.c, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "source writeengineinfo.sh"; - }; - AB2B5C7508E6979600899067 = { - buildActionMask = 2147483647; - files = ( - AB2B5C7608E6979600899067, - AB2B5C7708E6979600899067, - AB2B5C7808E6979600899067, - AB2B5C7908E6979600899067, - AB2B5C7A08E6979600899067, - AB2B5C7B08E6979600899067, - AB2B5C7C08E6979600899067, - AB2B5C7D08E6979600899067, - AB2B5C7E08E6979600899067, - AB2B5C7F08E6979600899067, - AB2B5C8008E6979600899067, - AB2B5C8108E6979600899067, - AB2B5C8208E6979600899067, - AB2B5C8308E6979600899067, - AB8F394909545F3800B9F541, - ABD656410967A52B0066981D, - AB6F05A20983A54D00B8EBA0, - AB6F05AF0983A5DD00B8EBA0, - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB2B5C7608E6979600899067 = { - fileRef = AB3AFE9308DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C7708E6979600899067 = { - fileRef = AB3AFE9408DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7808E6979600899067 = { - fileRef = AB3AFE9508DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7908E6979600899067 = { - fileRef = AB3AFE9608DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7A08E6979600899067 = { - fileRef = AB3AFE9708DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7B08E6979600899067 = { - fileRef = AB3AFE9808DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7C08E6979600899067 = { - fileRef = AB3AFE9908DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7D08E6979600899067 = { - fileRef = AB3AFE9A08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7E08E6979600899067 = { - fileRef = AB3AFE9B08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C7F08E6979600899067 = { - fileRef = AB3AFE9C08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C8008E6979600899067 = { - fileRef = AB3AFE9D08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C8108E6979600899067 = { - fileRef = AB3AFE9E08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C8208E6979600899067 = { - fileRef = AB3AFE9F08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C8308E6979600899067 = { - fileRef = AB3AFEA008DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB2B5C8408E6979600899067 = { - buildActionMask = 2147483647; - files = ( - AB2B5C8508E6979600899067, - AB2B5C8608E6979600899067, - AB2B5C8708E6979600899067, - AB2B5C8808E6979600899067, - AB2B5C8908E6979600899067, - AB2B5C8A08E6979600899067, - AB2B5C8B08E6979600899067, - AB2B5C8C08E6979600899067, - AB2B5C8D08E6979600899067, - AB2B5C8E08E6979600899067, - AB2B5C8F08E6979600899067, - AB2B5C9008E6979600899067, - AB2B5C9108E6979600899067, - AB2B5C9208E6979600899067, - AB2B5C9308E6979600899067, - AB2B5D4708E69D9000899067, - AB8F394609545F2600B9F541, - ABD6563A0967A4FA0066981D, - AB6F059E0983A53200B8EBA0, - AB6F059F0983A53200B8EBA0, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB2B5C8508E6979600899067 = { - fileRef = AB3AF5F908DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8608E6979600899067 = { - fileRef = AB3AF5FA08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8708E6979600899067 = { - fileRef = AB3AF5FB08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8808E6979600899067 = { - fileRef = AB3AF5FC08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8908E6979600899067 = { - fileRef = AB3AF5FD08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8A08E6979600899067 = { - fileRef = AB3AF5FE08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8B08E6979600899067 = { - fileRef = AB3AF5FF08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8C08E6979600899067 = { - fileRef = AB3AF60008DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8D08E6979600899067 = { - fileRef = AB3AF60308DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8E08E6979600899067 = { - fileRef = AB3AF60608DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C8F08E6979600899067 = { - fileRef = AB3AF60808DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C9008E6979600899067 = { - fileRef = AB3AF60908DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C9108E6979600899067 = { - fileRef = AB3AF60A08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C9208E6979600899067 = { - fileRef = AB3AF60508DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C9308E6979600899067 = { - fileRef = AB3AF9CE08DEE17600C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5C9608E6979600899067 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB2B5C9708E6979600899067 = { - explicitFileType = archive.ar; - includeInIndex = 0; - isa = PBXFileReference; - path = libenginez.a; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB2B5D4508E69D9000899067 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = osxbits.m; - path = ../../src/osxbits.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB2B5D4608E69D9000899067 = { - fileRef = AB2B5D4508E69D9000899067; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5D4708E69D9000899067 = { - fileRef = AB2B5D4508E69D9000899067; - isa = PBXBuildFile; - settings = { - }; - }; - AB2B5D4808E69DB100899067 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = osxbits.h; - path = ../../include/osxbits.h; - refType = 4; - sourceTree = ""; - }; - AB3AF5E708DEDAA700C0AA42 = { - children = ( - AB3AF9D208DEE28200C0AA42, - AB3AF5F708DEDADD00C0AA42, - AB3AF62308DEDBBA00C0AA42, - AB3AF5F608DEDABE00C0AA42, - AB3AF9D008DEE1C400C0AA42, - ); - isa = PBXGroup; - refType = 4; - sourceTree = ""; - }; - AB3AF5E908DEDAA700C0AA42 = { - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_OPTIMIZATION_LEVEL = 0; - }; - isa = PBXBuildStyle; - name = Development; - }; - AB3AF5EA08DEDAA700C0AA42 = { - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; - }; - isa = PBXBuildStyle; - name = Deployment; - }; - AB3AF5EB08DEDAA700C0AA42 = { - buildSettings = { - }; - buildStyles = ( - AB3AF5E908DEDAA700C0AA42, - AB3AF5EA08DEDAA700C0AA42, - ); - hasScannedForEncodings = 0; - isa = PBXProject; - mainGroup = AB3AF5E708DEDAA700C0AA42; - productRefGroup = AB3AF5F608DEDABE00C0AA42; - projectDirPath = ""; - targets = ( - AB3AFBF408DF03EE00C0AA42, - AB3AF5F408DEDABE00C0AA42, - AB3AF9DD08DEE2CF00C0AA42, - AB2B5C7308E6979600899067, - ); - }; - AB3AF5F108DEDABE00C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AFEA108DF044D00C0AA42, - AB3AFEA208DF044D00C0AA42, - AB3AFEA308DF044D00C0AA42, - AB3AFEA408DF044D00C0AA42, - AB3AFEA508DF044D00C0AA42, - AB3AFEA608DF044D00C0AA42, - AB3AFEA708DF044D00C0AA42, - AB3AFEA808DF044D00C0AA42, - AB3AFEA908DF044D00C0AA42, - AB3AFEAA08DF044D00C0AA42, - AB3AFEAB08DF044D00C0AA42, - AB3AFEAC08DF044D00C0AA42, - AB3AFEAD08DF044D00C0AA42, - AB3AFEAE08DF044D00C0AA42, - AB8F394809545F3800B9F541, - ABD656400967A52B0066981D, - AB6F05A10983A54D00B8EBA0, - AB6F05AE0983A5DD00B8EBA0, - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF5F208DEDABE00C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AF60D08DEDB3100C0AA42, - AB3AF60E08DEDB3100C0AA42, - AB3AF60F08DEDB3100C0AA42, - AB3AF61008DEDB3100C0AA42, - AB3AF61108DEDB3100C0AA42, - AB3AF61208DEDB3100C0AA42, - AB3AF61308DEDB3100C0AA42, - AB3AF61408DEDB3100C0AA42, - AB3AF61708DEDB3100C0AA42, - AB3AF61A08DEDB3100C0AA42, - AB3AF61C08DEDB3100C0AA42, - AB3AF61D08DEDB3100C0AA42, - AB3AF61E08DEDB3100C0AA42, - AB3AF62108DEDB4F00C0AA42, - AB3AF9CF08DEE17600C0AA42, - AB2B5D4608E69D9000899067, - AB8F394509545F2600B9F541, - ABD656390967A4FA0066981D, - AB6F059C0983A53200B8EBA0, - AB6F059D0983A53200B8EBA0, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF5F308DEDABE00C0AA42 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF5F408DEDABE00C0AA42 = { - buildPhases = ( - AB3AF9CC08DEE11200C0AA42, - AB3AF5F108DEDABE00C0AA42, - AB3AF5F208DEDABE00C0AA42, - AB3AF5F308DEDABE00C0AA42, - ); - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PREPROCESSOR_DEFINITIONS = "SUPERBUILD POLYMOST USE_OPENGL USE_A_C NOASM RENDERTYPESDL=1 KSFORBUILD WITHKPLIB"; - HEADER_SEARCH_PATHS = "../../include ../../src"; - LIBRARY_STYLE = STATIC; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = engine; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas -Wno-char-subscripts"; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = engine; - productName = engine; - productReference = AB3AF5F508DEDABE00C0AA42; - productType = "com.apple.product-type.library.static"; - }; - AB3AF5F508DEDABE00C0AA42 = { - explicitFileType = archive.ar; - includeInIndex = 0; - isa = PBXFileReference; - path = libengine.a; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB3AF5F608DEDABE00C0AA42 = { - children = ( - AB3AF5F508DEDABE00C0AA42, - AB3AF9DE08DEE2CF00C0AA42, - AB2B5C9708E6979600899067, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = ""; - }; - AB3AF5F708DEDADD00C0AA42 = { - children = ( - AB3AFEAF08DF046600C0AA42, - AB3AF5F808DEDAEB00C0AA42, - ); - isa = PBXGroup; - name = Engine; - refType = 4; - sourceTree = ""; - }; - AB3AF5F808DEDAEB00C0AA42 = { - children = ( - AB8F394409545F2600B9F541, - AB3AF62208DEDB5700C0AA42, - AB3AF5F908DEDB3100C0AA42, - AB3AF5FA08DEDB3100C0AA42, - AB3AF5FB08DEDB3100C0AA42, - AB3AF5FC08DEDB3100C0AA42, - AB3AF5FD08DEDB3100C0AA42, - AB3AF5FE08DEDB3100C0AA42, - AB3AF5FF08DEDB3100C0AA42, - AB3AF9CE08DEE17600C0AA42, - AB3AF60008DEDB3100C0AA42, - AB3AF60308DEDB3100C0AA42, - AB6F059A0983A53200B8EBA0, - AB6F059B0983A53200B8EBA0, - ABD656380967A4FA0066981D, - AB3AF60508DEDB3100C0AA42, - AB3AF60608DEDB3100C0AA42, - AB2B5D4508E69D9000899067, - AB3AF60808DEDB3100C0AA42, - AB3AF60908DEDB3100C0AA42, - AB3AF60A08DEDB3100C0AA42, - ); - isa = PBXGroup; - name = Sources; - refType = 4; - sourceTree = ""; - }; - AB3AF5F908DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = "a-c.c"; - path = "../../src/a-c.c"; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF5FA08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = baselayer.c; - path = ../../src/baselayer.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF5FB08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = cache1d.c; - path = ../../src/cache1d.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF5FC08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = compat.c; - path = ../../src/compat.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF5FD08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = crc32.c; - path = ../../src/crc32.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF5FE08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = defs.c; - path = ../../src/defs.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF5FF08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = engine.c; - path = ../../src/engine.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60008DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = glbuild.c; - path = ../../src/glbuild.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60208DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = hightile.c; - path = ../../src/hightile.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60308DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = kplib.c; - path = ../../src/kplib.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60408DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = mdsprite.c; - path = ../../src/mdsprite.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60508DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = mmulti.c; - path = ../../src/mmulti.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60608DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = osd.c; - path = ../../src/osd.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60708DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = polymost.c; - path = ../../src/polymost.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60808DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = pragmas.c; - path = ../../src/pragmas.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60908DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = scriptfile.c; - path = ../../src/scriptfile.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60A08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = sdlayer.c; - path = ../../src/sdlayer.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60B08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = smalltextfont.c; - path = ../../src/smalltextfont.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60C08DEDB3100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = textfont.c; - path = ../../src/textfont.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF60D08DEDB3100C0AA42 = { - fileRef = AB3AF5F908DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF60E08DEDB3100C0AA42 = { - fileRef = AB3AF5FA08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF60F08DEDB3100C0AA42 = { - fileRef = AB3AF5FB08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61008DEDB3100C0AA42 = { - fileRef = AB3AF5FC08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61108DEDB3100C0AA42 = { - fileRef = AB3AF5FD08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61208DEDB3100C0AA42 = { - fileRef = AB3AF5FE08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61308DEDB3100C0AA42 = { - fileRef = AB3AF5FF08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61408DEDB3100C0AA42 = { - fileRef = AB3AF60008DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61708DEDB3100C0AA42 = { - fileRef = AB3AF60308DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61A08DEDB3100C0AA42 = { - fileRef = AB3AF60608DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61C08DEDB3100C0AA42 = { - fileRef = AB3AF60808DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61D08DEDB3100C0AA42 = { - fileRef = AB3AF60908DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF61E08DEDB3100C0AA42 = { - fileRef = AB3AF60A08DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF62108DEDB4F00C0AA42 = { - fileRef = AB3AF60508DEDB3100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF62208DEDB5700C0AA42 = { - children = ( - AB3AF60208DEDB3100C0AA42, - AB3AF60408DEDB3100C0AA42, - AB3AF60708DEDB3100C0AA42, - AB3AF60B08DEDB3100C0AA42, - AB3AF60C08DEDB3100C0AA42, - ); - isa = PBXGroup; - name = Included; - refType = 4; - sourceTree = ""; - }; - AB3AF62308DEDBBA00C0AA42 = { - children = ( - AB3AF64A08DEDC8600C0AA42, - AB3AF62408DEDBCD00C0AA42, - ); - isa = PBXGroup; - name = Frameworks; - refType = 4; - sourceTree = ""; - }; - AB3AF62408DEDBCD00C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = SDL.framework; - path = /Library/Frameworks/SDL.framework; - refType = 0; - sourceTree = ""; - }; - AB3AF64A08DEDC8600C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = OpenGL.framework; - path = /System/Library/Frameworks/OpenGL.framework; - refType = 0; - sourceTree = ""; - }; - AB3AF9CC08DEE11200C0AA42 = { - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - isa = PBXShellScriptBuildPhase; - outputPaths = ( - engineinfo.c, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "source writeengineinfo.sh"; - }; - AB3AF9CE08DEE17600C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = engineinfo.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9CF08DEE17600C0AA42 = { - fileRef = AB3AF9CE08DEE17600C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF9D008DEE1C400C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = writeengineinfo.sh; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9D208DEE28200C0AA42 = { - children = ( - AB3AFEB208DF049300C0AA42, - AB3AF9D308DEE28800C0AA42, - ); - isa = PBXGroup; - name = Editor; - refType = 4; - sourceTree = ""; - }; - AB3AF9D308DEE28800C0AA42 = { - children = ( - AB3AF9D408DEE2B000C0AA42, - AB3AF9D608DEE2B000C0AA42, - ); - isa = PBXGroup; - name = Sources; - refType = 4; - sourceTree = ""; - }; - AB3AF9D408DEE2B000C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = build.c; - path = ../../src/build.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9D608DEE2B000C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = config.c; - path = ../../src/config.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9DA08DEE2CF00C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AFEB408DF04B100C0AA42, - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF9DB08DEE2CF00C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AF9DF08DEE33C00C0AA42, - AB3AF9E108DEE33D00C0AA42, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF9DC08DEE2CF00C0AA42 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF9DD08DEE2CF00C0AA42 = { - buildPhases = ( - AB3AF9DA08DEE2CF00C0AA42, - AB3AF9DB08DEE2CF00C0AA42, - AB3AF9DC08DEE2CF00C0AA42, - ); - buildRules = ( - ); - buildSettings = { - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PREPROCESSOR_DEFINITIONS = "SUPERBUILD POLYMOST USE_OPENGL USE_A_C NOASM RENDERTYPESDL=1"; - HEADER_SEARCH_PATHS = ../../include; - LIBRARY_STYLE = STATIC; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = editor; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas"; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = editor; - productName = editor; - productReference = AB3AF9DE08DEE2CF00C0AA42; - productType = "com.apple.product-type.library.static"; - }; - AB3AF9DE08DEE2CF00C0AA42 = { - explicitFileType = archive.ar; - includeInIndex = 0; - isa = PBXFileReference; - path = libeditor.a; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB3AF9DF08DEE33C00C0AA42 = { - fileRef = AB3AF9D408DEE2B000C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF9E108DEE33D00C0AA42 = { - fileRef = AB3AF9D608DEE2B000C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFBF408DF03EE00C0AA42 = { - buildPhases = ( - ); - buildSettings = { - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = All; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - }; - dependencies = ( - AB3AFE8A08DF03F400C0AA42, - AB3AFE8C08DF03F400C0AA42, - ); - isa = PBXAggregateTarget; - name = All; - productName = All; - }; - AB3AFE8908DF03F400C0AA42 = { - containerPortal = AB3AF5EB08DEDAA700C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AF5F408DEDABE00C0AA42; - remoteInfo = engine; - }; - AB3AFE8A08DF03F400C0AA42 = { - isa = PBXTargetDependency; - target = AB3AF5F408DEDABE00C0AA42; - targetProxy = AB3AFE8908DF03F400C0AA42; - }; - AB3AFE8B08DF03F400C0AA42 = { - containerPortal = AB3AF5EB08DEDAA700C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AF9DD08DEE2CF00C0AA42; - remoteInfo = editor; - }; - AB3AFE8C08DF03F400C0AA42 = { - isa = PBXTargetDependency; - target = AB3AF9DD08DEE2CF00C0AA42; - targetProxy = AB3AFE8B08DF03F400C0AA42; - }; - AB3AFE9308DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = a.h; - path = ../../include/a.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9408DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = baselayer.h; - path = ../../include/baselayer.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9508DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = build.h; - path = ../../include/build.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9608DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = cache1d.h; - path = ../../include/cache1d.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9708DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = compat.h; - path = ../../include/compat.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9808DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = crc32.h; - path = ../../include/crc32.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9908DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = engineinfo.h; - path = ../../include/engineinfo.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9A08DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = glbuild.h; - path = ../../include/glbuild.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9B08DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = kplib.h; - path = ../../include/kplib.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9C08DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = mmulti.h; - path = ../../include/mmulti.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9D08DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = osd.h; - path = ../../include/osd.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9E08DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = pragmas.h; - path = ../../include/pragmas.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFE9F08DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = scriptfile.h; - path = ../../include/scriptfile.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFEA008DF044D00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = sdlayer.h; - path = ../../include/sdlayer.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFEA108DF044D00C0AA42 = { - fileRef = AB3AFE9308DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Private, - ); - }; - }; - AB3AFEA208DF044D00C0AA42 = { - fileRef = AB3AFE9408DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA308DF044D00C0AA42 = { - fileRef = AB3AFE9508DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA408DF044D00C0AA42 = { - fileRef = AB3AFE9608DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA508DF044D00C0AA42 = { - fileRef = AB3AFE9708DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA608DF044D00C0AA42 = { - fileRef = AB3AFE9808DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA708DF044D00C0AA42 = { - fileRef = AB3AFE9908DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA808DF044D00C0AA42 = { - fileRef = AB3AFE9A08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEA908DF044D00C0AA42 = { - fileRef = AB3AFE9B08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEAA08DF044D00C0AA42 = { - fileRef = AB3AFE9C08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEAB08DF044D00C0AA42 = { - fileRef = AB3AFE9D08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEAC08DF044D00C0AA42 = { - fileRef = AB3AFE9E08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEAD08DF044D00C0AA42 = { - fileRef = AB3AFE9F08DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEAE08DF044D00C0AA42 = { - fileRef = AB3AFEA008DF044D00C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB3AFEAF08DF046600C0AA42 = { - children = ( - AB3AFE9308DF044D00C0AA42, - AB3AFE9408DF044D00C0AA42, - AB3AFE9508DF044D00C0AA42, - AB3AFE9608DF044D00C0AA42, - AB3AFE9708DF044D00C0AA42, - AB3AFE9808DF044D00C0AA42, - AB3AFE9908DF044D00C0AA42, - AB3AFE9A08DF044D00C0AA42, - AB3AFE9B08DF044D00C0AA42, - AB6F05AD0983A5DD00B8EBA0, - AB6F05A00983A54D00B8EBA0, - ABD6563F0967A52B0066981D, - AB8F394709545F3800B9F541, - AB3AFE9C08DF044D00C0AA42, - AB3AFE9D08DF044D00C0AA42, - AB2B5D4808E69DB100899067, - AB3AFE9E08DF044D00C0AA42, - AB3AFE9F08DF044D00C0AA42, - AB3AFEA008DF044D00C0AA42, - ); - isa = PBXGroup; - name = Headers; - path = ""; - refType = 4; - sourceTree = ""; - }; - AB3AFEB208DF049300C0AA42 = { - children = ( - AB3AFEB308DF04B100C0AA42, - ); - isa = PBXGroup; - name = Headers; - refType = 4; - sourceTree = ""; - }; - AB3AFEB308DF04B100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = editor.h; - path = ../../include/editor.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFEB408DF04B100C0AA42 = { - fileRef = AB3AFEB308DF04B100C0AA42; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB6F059A0983A53200B8EBA0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = lzf_c.c; - path = ../../src/lzf_c.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB6F059B0983A53200B8EBA0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = lzf_d.c; - path = ../../src/lzf_d.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB6F059C0983A53200B8EBA0 = { - fileRef = AB6F059A0983A53200B8EBA0; - isa = PBXBuildFile; - settings = { - }; - }; - AB6F059D0983A53200B8EBA0 = { - fileRef = AB6F059B0983A53200B8EBA0; - isa = PBXBuildFile; - settings = { - }; - }; - AB6F059E0983A53200B8EBA0 = { - fileRef = AB6F059A0983A53200B8EBA0; - isa = PBXBuildFile; - settings = { - }; - }; - AB6F059F0983A53200B8EBA0 = { - fileRef = AB6F059B0983A53200B8EBA0; - isa = PBXBuildFile; - settings = { - }; - }; - AB6F05A00983A54D00B8EBA0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = lzfP.h; - path = ../../src/lzfP.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB6F05A10983A54D00B8EBA0 = { - fileRef = AB6F05A00983A54D00B8EBA0; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Private, - ); - }; - }; - AB6F05A20983A54D00B8EBA0 = { - fileRef = AB6F05A00983A54D00B8EBA0; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Private, - ); - }; - }; - AB6F05AD0983A5DD00B8EBA0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = lzf.h; - path = ../../include/lzf.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB6F05AE0983A5DD00B8EBA0 = { - fileRef = AB6F05AD0983A5DD00B8EBA0; - isa = PBXBuildFile; - settings = { - }; - }; - AB6F05AF0983A5DD00B8EBA0 = { - fileRef = AB6F05AD0983A5DD00B8EBA0; - isa = PBXBuildFile; - settings = { - }; - }; - AB8F394409545F2600B9F541 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = md4.c; - path = ../../src/md4.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB8F394509545F2600B9F541 = { - fileRef = AB8F394409545F2600B9F541; - isa = PBXBuildFile; - settings = { - }; - }; - AB8F394609545F2600B9F541 = { - fileRef = AB8F394409545F2600B9F541; - isa = PBXBuildFile; - settings = { - }; - }; - AB8F394709545F3800B9F541 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = md4.h; - path = ../../include/md4.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB8F394809545F3800B9F541 = { - fileRef = AB8F394709545F3800B9F541; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - AB8F394909545F3800B9F541 = { - fileRef = AB8F394709545F3800B9F541; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; - ABD656380967A4FA0066981D = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = lzwnew.c; - path = ../../src/lzwnew.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - ABD656390967A4FA0066981D = { - fileRef = ABD656380967A4FA0066981D; - isa = PBXBuildFile; - settings = { - }; - }; - ABD6563A0967A4FA0066981D = { - fileRef = ABD656380967A4FA0066981D; - isa = PBXBuildFile; - settings = { - }; - }; - ABD6563F0967A52B0066981D = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = lzwnew.h; - path = ../../include/lzwnew.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - ABD656400967A52B0066981D = { - fileRef = ABD6563F0967A52B0066981D; - isa = PBXBuildFile; - settings = { - }; - }; - ABD656410967A52B0066981D = { - fileRef = ABD6563F0967A52B0066981D; - isa = PBXBuildFile; - settings = { - }; - }; - }; - rootObject = AB3AF5EB08DEDAA700C0AA42; -} diff --git a/polymer/build/osx/engine/engineinfo.c b/polymer/build/osx/engine/engineinfo.c deleted file mode 100644 index c3d9bc194..000000000 --- a/polymer/build/osx/engine/engineinfo.c +++ /dev/null @@ -1,5 +0,0 @@ -const char _engine_cflags[] = ""; -const char _engine_libs[] = ""; -const char _engine_uname[] = "Darwin megumi.fnord 7.9.0 Darwin Kernel Version 7.9.0: Wed Mar 30 20:11:17 PST 2005; root:xnu/xnu-517.12.7.obj~1/RELEASE_PPC Power Macintosh powerpc"; -const char _engine_compiler[] = "gcc 3.3 ppc-darwin"; -const char _engine_date[] = __DATE__ " " __TIME__; diff --git a/polymer/build/osx/engine/writeengineinfo.sh b/polymer/build/osx/engine/writeengineinfo.sh deleted file mode 100644 index 068c43b26..000000000 --- a/polymer/build/osx/engine/writeengineinfo.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -UNAME=`uname -a` -CC="gcc" -CCVERSION=`$CC -dumpversion` -CCMACHINE=`$CC -dumpmachine` -echo "const char _engine_cflags[] = \"$OTHER_CFLAGS\";" > engineinfo.c -echo "const char _engine_libs[] = \"$LIBS\";" >> engineinfo.c -echo "const char _engine_uname[] = \"$UNAME\";" >> engineinfo.c -echo "const char _engine_compiler[] = \"$CC $CCVERSION $CCMACHINE\";" >> engineinfo.c -echo "const char _engine_date[] = __DATE__ \" \" __TIME__;" >> engineinfo.c diff --git a/polymer/build/osx/game/build.osxmain.h b/polymer/build/osx/game/build.osxmain.h deleted file mode 100644 index 4683df57a..000000000 --- a/polymer/build/osx/game/build.osxmain.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SDLMain.m - main entry point for our Cocoa-ized SDL app - Initial Version: Darrell Walisser - Non-NIB-Code & other changes: Max Horn - - Feel free to customize this file to suit your needs -*/ - -#import - -@interface SDLMain : NSObject -@end diff --git a/polymer/build/osx/game/build.osxmain.m b/polymer/build/osx/game/build.osxmain.m deleted file mode 100644 index 881c83f3c..000000000 --- a/polymer/build/osx/game/build.osxmain.m +++ /dev/null @@ -1,179 +0,0 @@ -/* SDLMain.m - main entry point for our Cocoa-ized SDL app - Initial Version: Darrell Walisser - Non-NIB-Code & other changes: Max Horn - - Feel free to customize this file to suit your needs -*/ - -#import -#import "build.osxmain.h" -#import /* for MAXPATHLEN */ -#import - -static int gArgc; -static char **gArgv; -static BOOL gFinderLaunch; - -/* A helper category for NSString */ -@interface NSString (ReplaceSubString) -- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString; -@end - -@interface SDLApplication : NSApplication -@end - -@implementation SDLApplication -/* Invoked from the Quit menu item */ -- (void)terminate:(id)sender -{ - /* Post a SDL_QUIT event */ - SDL_Event event; - event.type = SDL_QUIT; - SDL_PushEvent(&event); -} -@end - - -/* The main class of the application, the application's delegate */ -@implementation SDLMain - -/* Set the working directory to the .app's parent directory */ -- (void) setupWorkingDirectory:(BOOL)shouldChdir -{ - char parentdir[MAXPATHLEN]; - char *c; - - strncpy ( parentdir, gArgv[0], sizeof(parentdir) ); - c = (char*) parentdir; - - while (*c != '\0') /* go to end */ - c++; - - while (*c != '/') /* back up to parent */ - c--; - - *c++ = '\0'; /* cut off last part (binary name) */ - - if (shouldChdir) - { - assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */ - assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */ - } -} - -/* Fix menu to contain the real app name instead of "SDL App" */ -- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName -{ - NSRange aRange; - NSEnumerator *enumerator; - NSMenuItem *menuItem; - - aRange = [[aMenu title] rangeOfString:@"SDL App"]; - if (aRange.length != 0) - [aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]]; - - enumerator = [[aMenu itemArray] objectEnumerator]; - while ((menuItem = [enumerator nextObject])) - { - aRange = [[menuItem title] rangeOfString:@"SDL App"]; - if (aRange.length != 0) - [menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]]; - if ([menuItem hasSubmenu]) - [self fixMenu:[menuItem submenu] withAppName:appName]; - } - [ aMenu sizeToFit ]; -} - -/* Called when the internal event loop has just started running */ -- (void) applicationDidFinishLaunching: (NSNotification *) note -{ - int status; - - /* Set the working directory to the .app's parent directory */ - [self setupWorkingDirectory:gFinderLaunch]; - - /* Set the main menu to contain the real app name instead of "SDL App" */ - //[self fixMenu:[NSApp mainMenu] withAppName:[[NSProcessInfo processInfo] processName]]; - [self fixMenu:[NSApp mainMenu] withAppName:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]]; - - /* Hand off to main application code */ - status = SDL_main (gArgc, gArgv); - - /* We're done, thank you for playing */ - exit(status); -} -@end - - -@implementation NSString (ReplaceSubString) - -- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString -{ - unsigned int bufferSize; - unsigned int selfLen = [self length]; - unsigned int aStringLen = [aString length]; - unichar *buffer; - NSRange localRange; - NSString *result; - - bufferSize = selfLen + aStringLen - aRange.length; - buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar)); - - /* Get first part into buffer */ - localRange.location = 0; - localRange.length = aRange.location; - [self getCharacters:buffer range:localRange]; - - /* Get middle part into buffer */ - localRange.location = 0; - localRange.length = aStringLen; - [aString getCharacters:(buffer+aRange.location) range:localRange]; - - /* Get last part into buffer */ - localRange.location = aRange.location + aRange.length; - localRange.length = selfLen - localRange.location; - [self getCharacters:(buffer+aRange.location+aStringLen) range:localRange]; - - /* Build output string */ - result = [NSString stringWithCharacters:buffer length:bufferSize]; - - NSDeallocateMemoryPages(buffer, bufferSize); - - return result; -} - -@end - - - -#ifdef main -# undef main -#endif - - -/* Main entry point to executable - should *not* be SDL_main! */ -int main (int argc, char **argv) -{ - - /* Copy the arguments into a global variable */ - int i; - - /* This is passed if we are launched by double-clicking */ - if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) { - gArgc = 1; - gFinderLaunch = YES; - } else { - gArgc = argc; - gFinderLaunch = NO; - } - gArgv = (char**) malloc (sizeof(*gArgv) * (gArgc+1)); - assert (gArgv != NULL); - for (i = 0; i < gArgc; i++) - gArgv[i] = argv[i]; - gArgv[i] = NULL; - - [SDLApplication poseAsClass:[NSApplication class]]; - NSApplicationMain (argc, argv); - - return 0; -} diff --git a/polymer/build/osx/game/editor-Info.plist b/polymer/build/osx/game/editor-Info.plist deleted file mode 100644 index f9528ec10..000000000 --- a/polymer/build/osx/game/editor-Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - build - CFBundleIdentifier - au.id.jonof.build - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - NSMainNibFile - osxmain - NSPrincipalClass - NSApplication - - diff --git a/polymer/build/osx/game/game-Info.plist b/polymer/build/osx/game/game-Info.plist deleted file mode 100644 index 708c3b2f3..000000000 --- a/polymer/build/osx/game/game-Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - game - CFBundleIdentifier - au.id.jonof.kenbuild - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - NSMainNibFile - osxmain - NSPrincipalClass - NSApplication - - diff --git a/polymer/build/osx/game/game.osxmain.h b/polymer/build/osx/game/game.osxmain.h deleted file mode 100644 index 4683df57a..000000000 --- a/polymer/build/osx/game/game.osxmain.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SDLMain.m - main entry point for our Cocoa-ized SDL app - Initial Version: Darrell Walisser - Non-NIB-Code & other changes: Max Horn - - Feel free to customize this file to suit your needs -*/ - -#import - -@interface SDLMain : NSObject -@end diff --git a/polymer/build/osx/game/game.osxmain.m b/polymer/build/osx/game/game.osxmain.m deleted file mode 100644 index fec706b93..000000000 --- a/polymer/build/osx/game/game.osxmain.m +++ /dev/null @@ -1,179 +0,0 @@ -/* SDLMain.m - main entry point for our Cocoa-ized SDL app - Initial Version: Darrell Walisser - Non-NIB-Code & other changes: Max Horn - - Feel free to customize this file to suit your needs -*/ - -#import -#import "game.osxmain.h" -#import /* for MAXPATHLEN */ -#import - -static int gArgc; -static char **gArgv; -static BOOL gFinderLaunch; - -/* A helper category for NSString */ -@interface NSString (ReplaceSubString) -- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString; -@end - -@interface SDLApplication : NSApplication -@end - -@implementation SDLApplication -/* Invoked from the Quit menu item */ -- (void)terminate:(id)sender -{ - /* Post a SDL_QUIT event */ - SDL_Event event; - event.type = SDL_QUIT; - SDL_PushEvent(&event); -} -@end - - -/* The main class of the application, the application's delegate */ -@implementation SDLMain - -/* Set the working directory to the .app's parent directory */ -- (void) setupWorkingDirectory:(BOOL)shouldChdir -{ - char parentdir[MAXPATHLEN]; - char *c; - - strncpy ( parentdir, gArgv[0], sizeof(parentdir) ); - c = (char*) parentdir; - - while (*c != '\0') /* go to end */ - c++; - - while (*c != '/') /* back up to parent */ - c--; - - *c++ = '\0'; /* cut off last part (binary name) */ - - if (shouldChdir) - { - assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */ - assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */ - } -} - -/* Fix menu to contain the real app name instead of "SDL App" */ -- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName -{ - NSRange aRange; - NSEnumerator *enumerator; - NSMenuItem *menuItem; - - aRange = [[aMenu title] rangeOfString:@"SDL App"]; - if (aRange.length != 0) - [aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]]; - - enumerator = [[aMenu itemArray] objectEnumerator]; - while ((menuItem = [enumerator nextObject])) - { - aRange = [[menuItem title] rangeOfString:@"SDL App"]; - if (aRange.length != 0) - [menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]]; - if ([menuItem hasSubmenu]) - [self fixMenu:[menuItem submenu] withAppName:appName]; - } - [ aMenu sizeToFit ]; -} - -/* Called when the internal event loop has just started running */ -- (void) applicationDidFinishLaunching: (NSNotification *) note -{ - int status; - - /* Set the working directory to the .app's parent directory */ - [self setupWorkingDirectory:gFinderLaunch]; - - /* Set the main menu to contain the real app name instead of "SDL App" */ - //[self fixMenu:[NSApp mainMenu] withAppName:[[NSProcessInfo processInfo] processName]]; - [self fixMenu:[NSApp mainMenu] withAppName:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]]; - - /* Hand off to main application code */ - status = SDL_main (gArgc, gArgv); - - /* We're done, thank you for playing */ - exit(status); -} -@end - - -@implementation NSString (ReplaceSubString) - -- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString -{ - unsigned int bufferSize; - unsigned int selfLen = [self length]; - unsigned int aStringLen = [aString length]; - unichar *buffer; - NSRange localRange; - NSString *result; - - bufferSize = selfLen + aStringLen - aRange.length; - buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar)); - - /* Get first part into buffer */ - localRange.location = 0; - localRange.length = aRange.location; - [self getCharacters:buffer range:localRange]; - - /* Get middle part into buffer */ - localRange.location = 0; - localRange.length = aStringLen; - [aString getCharacters:(buffer+aRange.location) range:localRange]; - - /* Get last part into buffer */ - localRange.location = aRange.location + aRange.length; - localRange.length = selfLen - localRange.location; - [self getCharacters:(buffer+aRange.location+aStringLen) range:localRange]; - - /* Build output string */ - result = [NSString stringWithCharacters:buffer length:bufferSize]; - - NSDeallocateMemoryPages(buffer, bufferSize); - - return result; -} - -@end - - - -#ifdef main -# undef main -#endif - - -/* Main entry point to executable - should *not* be SDL_main! */ -int main (int argc, char **argv) -{ - - /* Copy the arguments into a global variable */ - int i; - - /* This is passed if we are launched by double-clicking */ - if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) { - gArgc = 1; - gFinderLaunch = YES; - } else { - gArgc = argc; - gFinderLaunch = NO; - } - gArgv = (char**) malloc (sizeof(*gArgv) * (gArgc+1)); - assert (gArgv != NULL); - for (i = 0; i < gArgc; i++) - gArgv[i] = argv[i]; - gArgv[i] = NULL; - - [SDLApplication poseAsClass:[NSApplication class]]; - NSApplicationMain (argc, argv); - - return 0; -} diff --git a/polymer/build/osx/game/game.xcode/project.pbxproj b/polymer/build/osx/game/game.xcode/project.pbxproj deleted file mode 100644 index b08e004bb..000000000 --- a/polymer/build/osx/game/game.xcode/project.pbxproj +++ /dev/null @@ -1,825 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 39; - objects = { - AB2B5CB408E698F600899067 = { - fileType = archive.ar; - isa = PBXReferenceProxy; - path = libenginez.a; - refType = 3; - remoteRef = AB2B5CB808E6992B00899067; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB2B5CB808E6992B00899067 = { - containerPortal = AB3AFA5F08DEE45000C0AA42; - isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = AB2B5C9708E6979600899067; - remoteInfo = enginez; - }; - AB2B5D3708E69B7D00899067 = { - containerPortal = AB3AF9E808DEE39200C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AFEC008DF04E300C0AA42; - remoteInfo = editor; - }; - AB2B5D3808E69B7D00899067 = { - isa = PBXTargetDependency; - target = AB3AFEC008DF04E300C0AA42; - targetProxy = AB2B5D3708E69B7D00899067; - }; - AB3A002208DF064900C0AA42 = { - fileRef = AB3AFABF08DF035400C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3A002408DF064900C0AA42 = { - fileRef = AB3AFA6F08DEE50200C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3A002508DF064900C0AA42 = { - fileRef = AB3AFA7308DEE53C00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3A002608DF066200C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = libeditor.a; - path = /Users/jonof/ports/build/osx/engine/build/libeditor.a; - refType = 0; - sourceTree = ""; - }; - AB3A002708DF066200C0AA42 = { - fileRef = AB3A002608DF066200C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AF9E408DEE39200C0AA42 = { - children = ( - AB3AFA5F08DEE45000C0AA42, - ABBC7AA3099344E40064C16C, - AB3AF9EE08DEE3A100C0AA42, - AB3AF9EC08DEE39A00C0AA42, - AB3AFA7908DEFECF00C0AA42, - AB3AF9F908DEE3EE00C0AA42, - ); - isa = PBXGroup; - refType = 4; - sourceTree = ""; - }; - AB3AF9E608DEE39200C0AA42 = { - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_OPTIMIZATION_LEVEL = 0; - }; - isa = PBXBuildStyle; - name = Development; - }; - AB3AF9E708DEE39200C0AA42 = { - buildSettings = { - COPY_PHASE_STRIP = YES; - DEPLOYMENT_POSTPROCESSING = YES; - GCC_OPTIMIZATION_LEVEL = 2; - }; - isa = PBXBuildStyle; - name = Deployment; - }; - AB3AF9E808DEE39200C0AA42 = { - buildSettings = { - }; - buildStyles = ( - AB3AF9E608DEE39200C0AA42, - AB3AF9E708DEE39200C0AA42, - ); - hasScannedForEncodings = 0; - isa = PBXProject; - mainGroup = AB3AF9E408DEE39200C0AA42; - productRefGroup = AB3AF9F908DEE3EE00C0AA42; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = ABBC7AA5099344E60064C16C; - ProjectRef = ABBC7AA3099344E40064C16C; - }, - { - ProductGroup = AB3AFA6208DEE45200C0AA42; - ProjectRef = AB3AFA5F08DEE45000C0AA42; - }, - ); - targets = ( - AB3AFBF108DF03C900C0AA42, - AB3AF9F708DEE3EE00C0AA42, - AB3AFEC008DF04E300C0AA42, - ); - }; - AB3AF9EC08DEE39A00C0AA42 = { - children = ( - AB3AF9ED08DEE39E00C0AA42, - AB3AFA7708DEFEC100C0AA42, - AB3AF9FB08DEE3EE00C0AA42, - ); - isa = PBXGroup; - name = Game; - refType = 4; - sourceTree = ""; - }; - AB3AF9ED08DEE39E00C0AA42 = { - children = ( - AB3AFA6D08DEE4D700C0AA42, - AB3AF9F108DEE3DA00C0AA42, - AB3AF9F208DEE3DA00C0AA42, - AB3AF9F308DEE3DA00C0AA42, - ABBC7A9A099344CF0064C16C, - ); - isa = PBXGroup; - name = Sources; - refType = 4; - sourceTree = ""; - }; - AB3AF9EE08DEE3A100C0AA42 = { - children = ( - AB3AF9EF08DEE3AB00C0AA42, - AB3AFEC308DF04E300C0AA42, - ); - isa = PBXGroup; - name = Editor; - refType = 4; - sourceTree = ""; - }; - AB3AF9EF08DEE3AB00C0AA42 = { - children = ( - AB3AFECC08DF059E00C0AA42, - AB3AF9F008DEE3C100C0AA42, - ); - isa = PBXGroup; - name = Sources; - refType = 4; - sourceTree = ""; - }; - AB3AF9F008DEE3C100C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = bstub.c; - path = ../../src/bstub.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9F108DEE3DA00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = config.c; - path = ../../src/config.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9F208DEE3DA00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = game.c; - path = ../../src/game.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9F308DEE3DA00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = sound.c; - path = ../../src/sound.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AF9F408DEE3EE00C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AFA7808DEFEC200C0AA42, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF9F508DEE3EE00C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AFA5C08DEE43500C0AA42, - AB3AFA5D08DEE43500C0AA42, - AB3AFA6E08DEE4D700C0AA42, - ABBC7A9B099344CF0064C16C, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF9F608DEE3EE00C0AA42 = { - buildActionMask = 2147483647; - files = ( - ABBC7B6409934A410064C16C, - AB3AFAC008DF035400C0AA42, - AB3AFB5708DF037500C0AA42, - AB3AFABE08DF030B00C0AA42, - AB3AFA7008DEE50200C0AA42, - AB3AFA7408DEE53C00C0AA42, - ABBC7B6609934A5A0064C16C, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AF9F708DEE3EE00C0AA42 = { - buildPhases = ( - AB3AF9F408DEE3EE00C0AA42, - AB3AF9F508DEE3EE00C0AA42, - AB3AF9F608DEE3EE00C0AA42, - ABBC7B40099347230064C16C, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = /Users/jonof/ports/jfaud/osx/build; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PREPROCESSOR_DEFINITIONS = "SUPERBUILD POLYMOST USE_OPENGL NOASM RENDERTYPESDL=1"; - HEADER_SEARCH_PATHS = "/Developer/SDKs/fmodapi3741mac/api/inc ../../include"; - INFOPLIST_FILE = "game-Info.plist"; - INSTALL_PATH = "$(USER_APPS_DIR)"; - LIBRARY_SEARCH_PATHS = "/Developer/SDKs/fmodapi3741mac/api/lib ../engine/build"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = game; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas"; - }; - dependencies = ( - AB3AFAB608DF00A400C0AA42, - ); - isa = PBXNativeTarget; - name = game; - productName = game; - productReference = AB3AF9F808DEE3EE00C0AA42; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - game - CFBundleIdentifier - com.yourcompany.game - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - -"; - productType = "com.apple.product-type.application"; - }; - AB3AF9F808DEE3EE00C0AA42 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = game.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB3AF9F908DEE3EE00C0AA42 = { - children = ( - AB3AF9F808DEE3EE00C0AA42, - AB3AFEC108DF04E300C0AA42, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = ""; - }; - AB3AF9FB08DEE3EE00C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = text.xml; - path = "game-Info.plist"; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFA5C08DEE43500C0AA42 = { - fileRef = AB3AF9F108DEE3DA00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFA5D08DEE43500C0AA42 = { - fileRef = AB3AF9F208DEE3DA00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFA5F08DEE45000C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = "wrapper.pb-project"; - name = engine.xcode; - path = ../engine/engine.xcode; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFA6208DEE45200C0AA42 = { - children = ( - AB3AFA6308DEE45200C0AA42, - AB3AFA6408DEE45200C0AA42, - AB2B5CB408E698F600899067, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = ""; - }; - AB3AFA6308DEE45200C0AA42 = { - fileType = archive.ar; - isa = PBXReferenceProxy; - path = libengine.a; - refType = 3; - remoteRef = AB3AFA6708DEE46200C0AA42; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB3AFA6408DEE45200C0AA42 = { - fileType = archive.ar; - isa = PBXReferenceProxy; - path = libeditor.a; - refType = 3; - remoteRef = AB3AFA6808DEE46200C0AA42; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB3AFA6708DEE46200C0AA42 = { - containerPortal = AB3AFA5F08DEE45000C0AA42; - isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = AB3AF5F508DEDABE00C0AA42; - remoteInfo = engine; - }; - AB3AFA6808DEE46200C0AA42 = { - containerPortal = AB3AFA5F08DEE45000C0AA42; - isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = AB3AF9DE08DEE2CF00C0AA42; - remoteInfo = editor; - }; - AB3AFA6D08DEE4D700C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = game.osxmain.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFA6E08DEE4D700C0AA42 = { - fileRef = AB3AFA6D08DEE4D700C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFA6F08DEE50200C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = OpenGL.framework; - path = /System/Library/Frameworks/OpenGL.framework; - refType = 0; - sourceTree = ""; - }; - AB3AFA7008DEE50200C0AA42 = { - fileRef = AB3AFA6F08DEE50200C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFA7308DEE53C00C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = SDL.framework; - path = /Library/Frameworks/SDL.framework; - refType = 0; - sourceTree = ""; - }; - AB3AFA7408DEE53C00C0AA42 = { - fileRef = AB3AFA7308DEE53C00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFA7708DEFEC100C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - path = osxmain.nib; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFA7808DEFEC200C0AA42 = { - fileRef = AB3AFA7708DEFEC100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFA7908DEFECF00C0AA42 = { - children = ( - AB3A002608DF066200C0AA42, - AB3AFABD08DF030B00C0AA42, - ABBC7AD6099345F70064C16C, - AB3AFABF08DF035400C0AA42, - AB3AFB5608DF037500C0AA42, - ABBC7B6509934A5A0064C16C, - AB3AFA6F08DEE50200C0AA42, - AB3AFA7308DEE53C00C0AA42, - ); - isa = PBXGroup; - name = Frameworks; - refType = 4; - sourceTree = ""; - }; - AB3AFAB508DF00A400C0AA42 = { - containerPortal = AB3AFA5F08DEE45000C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AF5F408DEDABE00C0AA42; - remoteInfo = engine; - }; - AB3AFAB608DF00A400C0AA42 = { - isa = PBXTargetDependency; - name = "engine (from engine.xcode)"; - targetProxy = AB3AFAB508DF00A400C0AA42; - }; - AB3AFABD08DF030B00C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = libengine.a; - path = /Users/jonof/ports/build/osx/engine/build/libengine.a; - refType = 0; - sourceTree = ""; - }; - AB3AFABE08DF030B00C0AA42 = { - fileRef = AB3AFABD08DF030B00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFABF08DF035400C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = AppKit.framework; - path = /System/Library/Frameworks/AppKit.framework; - refType = 0; - sourceTree = ""; - }; - AB3AFAC008DF035400C0AA42 = { - fileRef = AB3AFABF08DF035400C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFB5608DF037500C0AA42 = { - comments = "Needed for fmod to link."; - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Carbon.framework; - path = /System/Library/Frameworks/Carbon.framework; - refType = 0; - sourceTree = ""; - }; - AB3AFB5708DF037500C0AA42 = { - fileRef = AB3AFB5608DF037500C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFBF108DF03C900C0AA42 = { - buildPhases = ( - ); - buildSettings = { - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = All; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - }; - dependencies = ( - AB3AFBF308DF03D200C0AA42, - AB2B5D3808E69B7D00899067, - ); - isa = PBXAggregateTarget; - name = All; - productName = All; - }; - AB3AFBF208DF03D200C0AA42 = { - containerPortal = AB3AF9E808DEE39200C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AF9F708DEE3EE00C0AA42; - remoteInfo = game; - }; - AB3AFBF308DF03D200C0AA42 = { - isa = PBXTargetDependency; - target = AB3AF9F708DEE3EE00C0AA42; - targetProxy = AB3AFBF208DF03D200C0AA42; - }; - AB3AFEBD08DF04E300C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AFECE08DF05AE00C0AA42, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AFEBE08DF04E300C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3AFECA08DF058D00C0AA42, - AB3AFECD08DF059E00C0AA42, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AFEBF08DF04E300C0AA42 = { - buildActionMask = 2147483647; - files = ( - AB3A002208DF064900C0AA42, - AB3A002708DF066200C0AA42, - AB3AFECF08DF063D00C0AA42, - AB3A002408DF064900C0AA42, - AB3A002508DF064900C0AA42, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - AB3AFEC008DF04E300C0AA42 = { - buildPhases = ( - AB3AFEBD08DF04E300C0AA42, - AB3AFEBE08DF04E300C0AA42, - AB3AFEBF08DF04E300C0AA42, - ); - buildRules = ( - ); - buildSettings = { - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PREPROCESSOR_DEFINITIONS = "SUPERBUILD POLYMOST USE_OPENGL NOASM USE_A_C RENDERTYPESDL=1"; - HEADER_SEARCH_PATHS = ../../include; - INFOPLIST_FILE = "editor-Info.plist"; - INSTALL_PATH = "$(USER_APPS_DIR)"; - LIBRARY_SEARCH_PATHS = ../engine/build; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = build; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas"; - }; - dependencies = ( - AB3AFEC508DF04EB00C0AA42, - AB3AFEC708DF04EB00C0AA42, - ); - isa = PBXNativeTarget; - name = editor; - productName = editor; - productReference = AB3AFEC108DF04E300C0AA42; - productSettingsXML = " - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - editor - CFBundleIdentifier - com.yourcompany.editor - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - -"; - productType = "com.apple.product-type.application"; - }; - AB3AFEC108DF04E300C0AA42 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = build.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - AB3AFEC308DF04E300C0AA42 = { - isa = PBXFileReference; - lastKnownFileType = text.xml; - path = "editor-Info.plist"; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFEC408DF04EB00C0AA42 = { - containerPortal = AB3AFA5F08DEE45000C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AF5F408DEDABE00C0AA42; - remoteInfo = engine; - }; - AB3AFEC508DF04EB00C0AA42 = { - isa = PBXTargetDependency; - name = "engine (from engine.xcode)"; - targetProxy = AB3AFEC408DF04EB00C0AA42; - }; - AB3AFEC608DF04EB00C0AA42 = { - containerPortal = AB3AFA5F08DEE45000C0AA42; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AB3AF9DD08DEE2CF00C0AA42; - remoteInfo = editor; - }; - AB3AFEC708DF04EB00C0AA42 = { - isa = PBXTargetDependency; - name = "editor (from engine.xcode)"; - targetProxy = AB3AFEC608DF04EB00C0AA42; - }; - AB3AFECA08DF058D00C0AA42 = { - fileRef = AB3AF9F008DEE3C100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFECC08DF059E00C0AA42 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - path = build.osxmain.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - AB3AFECD08DF059E00C0AA42 = { - fileRef = AB3AFECC08DF059E00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFECE08DF05AE00C0AA42 = { - fileRef = AB3AFA7708DEFEC100C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - AB3AFECF08DF063D00C0AA42 = { - fileRef = AB3AFABD08DF030B00C0AA42; - isa = PBXBuildFile; - settings = { - }; - }; - ABBC7A9A099344CF0064C16C = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - name = jfaud_sound.cpp; - path = ../../src/jfaud_sound.cpp; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - ABBC7A9B099344CF0064C16C = { - fileRef = ABBC7A9A099344CF0064C16C; - isa = PBXBuildFile; - settings = { - }; - }; - ABBC7AA3099344E40064C16C = { - isa = PBXFileReference; - lastKnownFileType = "wrapper.pb-project"; - name = jfaud.xcode; - path = ../../../jfaud/osx/jfaud.xcode; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - ABBC7AA5099344E60064C16C = { - children = ( - ABBC7AA6099344E60064C16C, - ABBC7AA7099344E60064C16C, - ABBC7AA8099344E60064C16C, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = ""; - }; - ABBC7AA6099344E60064C16C = { - fileType = wrapper.framework; - isa = PBXReferenceProxy; - path = jfaud.framework; - refType = 3; - remoteRef = ABBC7AAA099344F50064C16C; - sourceTree = BUILT_PRODUCTS_DIR; - }; - ABBC7AA7099344E60064C16C = { - fileType = archive.ar; - isa = PBXReferenceProxy; - path = libmpadec.a; - refType = 3; - remoteRef = ABBC7AAB099344F50064C16C; - sourceTree = BUILT_PRODUCTS_DIR; - }; - ABBC7AA8099344E60064C16C = { - fileType = wrapper.application; - isa = PBXReferenceProxy; - path = jfaudtest.app; - refType = 3; - remoteRef = ABBC7AAC099344F50064C16C; - sourceTree = BUILT_PRODUCTS_DIR; - }; - ABBC7AAA099344F50064C16C = { - containerPortal = ABBC7AA3099344E40064C16C; - isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = 8DC2EF5B0486A6940098B216; - remoteInfo = jfaud; - }; - ABBC7AAB099344F50064C16C = { - containerPortal = ABBC7AA3099344E40064C16C; - isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = ABE7399C095277C50040A74A; - remoteInfo = mpadec; - }; - ABBC7AAC099344F50064C16C = { - containerPortal = ABBC7AA3099344E40064C16C; - isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = ABE7394E09526A5B0040A74A; - remoteInfo = jfaudtest; - }; - ABBC7AD6099345F70064C16C = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = jfaud.framework; - path = /Users/jonof/ports/jfaud/osx/build/jfaud.framework; - refType = 0; - sourceTree = ""; - }; - ABBC7B40099347230064C16C = { - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ABBC7B410993474A0064C16C, - ); - isa = PBXCopyFilesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - ABBC7B410993474A0064C16C = { - fileRef = ABBC7AD6099345F70064C16C; - isa = PBXBuildFile; - settings = { - }; - }; - ABBC7B6409934A410064C16C = { - fileRef = ABBC7AD6099345F70064C16C; - isa = PBXBuildFile; - settings = { - }; - }; - ABBC7B6509934A5A0064C16C = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = OpenAL.framework; - path = ../../../../../../Library/Frameworks/OpenAL.framework; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - ABBC7B6609934A5A0064C16C = { - fileRef = ABBC7B6509934A5A0064C16C; - isa = PBXBuildFile; - settings = { - }; - }; - }; - rootObject = AB3AF9E808DEE39200C0AA42; -} diff --git a/polymer/build/osx/game/osxmain.nib/classes.nib b/polymer/build/osx/game/osxmain.nib/classes.nib deleted file mode 100644 index b014bc964..000000000 --- a/polymer/build/osx/game/osxmain.nib/classes.nib +++ /dev/null @@ -1,7 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {ACTIONS = {}; CLASS = SDLMain; LANGUAGE = ObjC; SUPERCLASS = NSObject; } - ); - IBVersion = 1; -} \ No newline at end of file diff --git a/polymer/build/osx/game/osxmain.nib/info.nib b/polymer/build/osx/game/osxmain.nib/info.nib deleted file mode 100644 index eb4b6a84b..000000000 --- a/polymer/build/osx/game/osxmain.nib/info.nib +++ /dev/null @@ -1,21 +0,0 @@ - - - - - IBDocumentLocation - 52 97 356 240 0 0 1024 746 - IBEditorPositions - - 29 - 196 422 195 44 0 0 1024 746 - - IBFramework Version - 364.0 - IBOpenObjects - - 29 - - IBSystem Version - 7W98 - - diff --git a/polymer/build/osx/game/osxmain.nib/objects.nib b/polymer/build/osx/game/osxmain.nib/objects.nib deleted file mode 100644 index 7cdeb7ba7..000000000 Binary files a/polymer/build/osx/game/osxmain.nib/objects.nib and /dev/null differ diff --git a/polymer/build/src/build.c b/polymer/build/src/build.c index 56406e882..ae030850b 100644 --- a/polymer/build/src/build.c +++ b/polymer/build/src/build.c @@ -529,6 +529,10 @@ void editinput(void) if (mlook == 1) { + if(klabs(mousx) > klabs(mousy)) + mousy /= 3; + else mousx /= 3; + ang += mousx>>1; horiz -= (mousy>>2); diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 3c746e4e1..d3689d8c3 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -4423,12 +4423,6 @@ void ExtAnalyzeSprites(void) } // else tspr->cstat&=32767; -#if defined(POLYMOST) && defined(USE_OPENGL) - if (bpp > 8 && usemodels && md_tilehasmodel(tspr->picnum)) { - tspr->cstat &= ~4; - break; - } -#endif if(frames!=0) { if(frames==10) frames=0; @@ -4445,6 +4439,13 @@ void ExtAnalyzeSprites(void) tspr->picnum += 8-k; tspr->cstat |= 4; //set x-flipping bit } + +#if defined(POLYMOST) && defined(USE_OPENGL) + if (bpp > 8 && usemodels && md_tilehasmodel(tspr->picnum)) { + tspr->cstat &= ~4; + break; + } +#endif } if(frames==2) tspr->picnum+=((((4-(totalclock>>5)))&1)*5); diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c index 43ab1d39c..0b1c7e5c8 100644 --- a/polymer/eduke32/source/config.c +++ b/polymer/eduke32/source/config.c @@ -63,7 +63,7 @@ int32 UseJoystick = 0, UseMouse = 1; int32 RunMode; int32 AutoAim; // JBF 20031125 int32 ShowOpponentWeapons; -int32 MouseFilter; +int32 MouseFilter,MouseBias; int32 SmoothInput; // JBF 20031211: Store the input settings because @@ -203,6 +203,7 @@ void CONFIG_SetDefaults( void ) FXDevice = 0; FXVolume = 220; MixRate = 44100; + MouseBias = 0; MouseFilter = 0; MusicDevice = 0; MusicToggle = 1; @@ -675,6 +676,7 @@ void CONFIG_ReadSetup( void ) SCRIPT_GetNumber( scripthandle, "Controls","MouseAimingFlipped",&ud.mouseflip); // mouse aiming inverted SCRIPT_GetNumber( scripthandle, "Controls","MouseAiming",&ud.mouseaiming); // 1=momentary/0=toggle ps[0].aim_mode = ud.mouseaiming; + SCRIPT_GetNumber( scripthandle, "Controls","MouseBias",&MouseBias); SCRIPT_GetNumber( scripthandle, "Controls","MouseFilter",&MouseFilter); SCRIPT_GetNumber( scripthandle, "Controls","SmoothInput",&SmoothInput); SCRIPT_GetNumber( scripthandle, "Controls","UseJoystick",&UseJoystick); @@ -717,6 +719,7 @@ void CONFIG_WriteSetup( void ) SCRIPT_PutNumber( scripthandle, "Controls","AutoAim",AutoAim,false,false); SCRIPT_PutNumber( scripthandle, "Controls","MouseAimingFlipped",ud.mouseflip,false,false); SCRIPT_PutNumber( scripthandle, "Controls","MouseAiming",ud.mouseaiming,false,false); + SCRIPT_PutNumber( scripthandle, "Controls","MouseBias",MouseBias,false,false); SCRIPT_PutNumber( scripthandle, "Controls","MouseFilter",MouseFilter,false,false); SCRIPT_PutNumber( scripthandle, "Controls","SmoothInput",SmoothInput,false,false); SCRIPT_PutNumber( scripthandle, "Controls","RunKeyBehaviour",ud.runkey_mode,false,false); diff --git a/polymer/eduke32/source/config.h b/polymer/eduke32/source/config.h index a7ca2c962..1f9daffc2 100644 --- a/polymer/eduke32/source/config.h +++ b/polymer/eduke32/source/config.h @@ -45,7 +45,7 @@ extern int32 ReverseStereo; extern int32 UseJoystick, UseMouse; extern int32 RunMode; extern int32 AutoAim; -extern int32 MouseFilter; +extern int32 MouseFilter, MouseBias; extern int32 SmoothInput; extern int32 ShowOpponentWeapons; extern int32 ScreenMode; diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 0d2653a8a..3b571339e 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -5839,38 +5839,38 @@ void loadefs(char *filenam) fta_quotes[i] = Bcalloc(MAXQUOTELEN,sizeof(char)); { char *ppdeathstrings[] = { - "%^2%s WAS KICKED TO THE CURB BY %s", - "%^2%s WAS PICKED OFF BY %s", - "%^2%s TOOK %s'S SHOT TO THE FACE", - "%^2%s DANCED THE CHAINGUN CHA-CHA WITH %s", - "%^2%s TRIED TO MAKE A BONG OUT OF %s'S ROCKET", - "%^2%s EXPLODED. BLAME %s!", - "%^2%s BECAME ONE WITH THE GUM ON %s'S SHOE", - "%^2%s WAS TOO COOL FOR %s", - "%^2%s EXPANDED HIS HORIZONS WITH HELP FROM %s", - "%^2%s THINKS %s SHOULD CHECK HIS GLASSES", + "%^2%s ^2WAS KICKED TO THE CURB BY %s", + "%^2%s ^2WAS PICKED OFF BY %s", + "%^2%s ^2TOOK %s^2'S SHOT TO THE FACE", + "%^2%s ^2DANCED THE CHAINGUN CHA-CHA WITH %s", + "%^2%s ^2TRIED TO MAKE A BONG OUT OF %s^2'S ROCKET", + "%^2%s ^2EXPLODED. BLAME %s^2!", + "%^2%s ^2BECAME ONE WITH THE GUM ON %s^2'S SHOE", + "%^2%s ^2WAS TOO COOL FOR %s", + "%^2%s ^2EXPANDED HIS HORIZONS WITH HELP FROM %s", + "%^2%s ^2THINKS %s ^2SHOULD CHECK HIS GLASSES", - "%^2%s TOOK %s'S BOOT TO THE HEAD", - "%^2%s FELL VICTIM TO %s's MAGIC AUTOAIMING PISTOL", - "%^2%s WAS CHASED OFF OF %s'S PORCH", - "%^2%s COULDN'T DANCE FAST ENOUGH FOR %s", - "%^2%s TRIED TO OUTRUN %s'S ROCKET", - "%^2%s FINALLY FOUND %s'S HIDDEN WMDS", - "%^2%s WAS JUST TRYING TO HELP %s TIE HIS SHOELACES", - "%^2%s's IGLOO WAS WRECKED BY %s", - "%^2%s BECAME A STICKY FILM ON %s'S BOOTS", - "%^2%s WISHES %s HAD PRACTICED BEFORE PLAYING", + "%^2%s ^2TOOK %s^2'S BOOT TO THE HEAD", + "%^2%s ^2FELL VICTIM TO %s^2's MAGIC AUTOAIMING PISTOL", + "%^2%s ^2WAS CHASED OFF OF %s^2'S PORCH", + "%^2%s ^2COULDN'T DANCE FAST ENOUGH FOR %s", + "%^2%s ^2TRIED TO OUTRUN %s^2'S ROCKET", + "%^2%s ^2FINALLY FOUND %s^2'S HIDDEN WMDS", + "%^2%s ^2WAS JUST TRYING TO HELP %s ^2TIE HIS SHOELACES", + "%^2%s^2's IGLOO WAS WRECKED BY %s", + "%^2%s ^2BECAME A STICKY FILM ON %s^2'S BOOTS", + "%^2%s ^2WISHES %s ^2HAD PRACTICED BEFORE PLAYING", - "%^2%s WAS WALKED ALL OVER BY %s", - "%^2%s WAS PICKED OFF BY %s", - "%^2%s WENT QUAIL HUNTING WITH VICE PRESIDENT %s", - "%^2%s ENDED UP WITH A FEW NEW HOLES FROM %s's CHAINGUN", - "%^2%s WAS TURNED INTO %s BRAND CHUNKY SALSA", - "%^2%s FOUND A PRESENT FROM %s", - "%^2%s WAS SCATHED BY %s'S SHRINK RAY", - "%^2%s WENT TO PIECES. %s, HOW COULD YOU?", - "%^2%s EXPANDED HIS HORIZONS WITH HELP FROM %s", - "%^2%s WANTS TO KNOW WHY %s IS EVEN PLAYING COOP", + "%^2%s ^2WAS WALKED ALL OVER BY %s", + "%^2%s ^2WAS PICKED OFF BY %s", + "%^2%s ^2WENT QUAIL HUNTING WITH VICE PRESIDENT %s", + "%^2%s ^2ENDED UP WITH A FEW NEW HOLES FROM %s^2's CHAINGUN", + "%^2%s ^2WAS TURNED INTO %s^2 BRAND CHUNKY SALSA", + "%^2%s ^2FOUND A PRESENT FROM %s", + "%^2%s ^2WAS SCATHED BY %s^2'S SHRINK RAY", + "%^2%s ^2WENT TO PIECES. %s^2, HOW COULD YOU?", + "%^2%s ^2EXPANDED HIS HORIZONS WITH HELP FROM %s", + "%^2%s ^2WANTS TO KNOW WHY %s ^2IS EVEN PLAYING COOP", }; char *podeathstrings[] = { diff --git a/polymer/eduke32/source/jmact/control.c b/polymer/eduke32/source/jmact/control.c index 77a40181c..718f6c616 100644 --- a/polymer/eduke32/source/jmact/control.c +++ b/polymer/eduke32/source/jmact/control.c @@ -604,12 +604,12 @@ void CONTROL_ApplyAxis(int32 axis, ControlInfo *info, controldevice device) } switch (map[axis].analogmap) { - case analog_turning: info->dyaw = set[axis].analog; break; - case analog_strafing: info->dx = set[axis].analog; break; - case analog_lookingupanddown: info->dpitch = set[axis].analog; break; - case analog_elevation: info->dy = set[axis].analog; break; - case analog_rolling: info->droll = set[axis].analog; break; - case analog_moving: info->dz = set[axis].analog; break; + case analog_turning: info->dyaw += set[axis].analog; break; + case analog_strafing: info->dx += set[axis].analog; break; + case analog_lookingupanddown: info->dpitch += set[axis].analog; break; + case analog_elevation: info->dy += set[axis].analog; break; + case analog_rolling: info->droll += set[axis].analog; break; + case analog_moving: info->dz += set[axis].analog; break; default: break; } } diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index c40a90043..cfa20fcce 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -458,6 +458,7 @@ struct cvarmappings { { "cl_messagetime", "cl_messagetime: length of time to display multiplayer chat messages\n", (void*)&ud.msgdisptime, CVAR_INT, 0, 0, 3600 }, + { "cl_mousebias", "cl_mousebias: hacky thing to make the mouse suck\n", (void*)&MouseBias, CVAR_INT, 0, 0, 32 }, { "cl_mousefilter", "cl_mousefilter: amount of mouse movement to filter out\n", (void*)&MouseFilter, CVAR_INT, 0, 0, 512 }, { "cl_showcoords", "cl_showcoords: show your position in the game world", (void*)&ud.coords, CVAR_BOOL, 0, 0, 1 }, diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 33d25b3f6..73d3e923f 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -2756,6 +2756,13 @@ void getinput(short snum) } } + if(MouseBias) + { + if(klabs(info.dyaw) > klabs(info.dpitch)) + info.dpitch /= MouseBias; + else info.dyaw /= MouseBias; + } + tics = totalclock-lastcontroltime; lastcontroltime = totalclock; @@ -2768,10 +2775,10 @@ void getinput(short snum) return; } - if(BUTTON(gamefunc_Jump)) - jump_input = 2; + if(BUTTON(gamefunc_Jump) && p->on_ground) + jump_input = 4; - loc.bits = (jump_input > 0); //BUTTON(gamefunc_Jump); + loc.bits = (jump_input > 0 || BUTTON(gamefunc_Jump)); //BUTTON(gamefunc_Jump); loc.bits |= BUTTON(gamefunc_Crouch)<<1; loc.bits |= BUTTON(gamefunc_Fire)<<2; loc.bits |= BUTTON(gamefunc_Aim_Up)<<3; @@ -3523,8 +3530,8 @@ void processinput(short snum) default: i = 0; break; } } - Bstrcpy(name1,strip_color_codes(&ud.user_name[snum][0])); - Bstrcpy(name2,strip_color_codes(&ud.user_name[p->frag_ps][0])); + Bstrcpy(name1,&ud.user_name[snum][0]); + Bstrcpy(name2,&ud.user_name[p->frag_ps][0]); Bsprintf(tempbuf,fta_quotes[16300+i+(mulscale(krand(), 3, 16)*10)],name1,name2); if(ScreenWidth >= 800) @@ -3542,7 +3549,7 @@ void processinput(short snum) i = 1; else i = 0; - Bsprintf(tempbuf,fta_quotes[16350+i],strip_color_codes(&ud.user_name[snum][0])); + Bsprintf(tempbuf,fta_quotes[16350+i],&ud.user_name[snum][0]); if(ScreenWidth >= 800) adduserquote(tempbuf); else OSD_Printf("%s\n",strip_color_codes(tempbuf));