[Glide64] Remove FixedPoint.asm.cpp

Source/Glide64/DepthBufferRender.cpp

@@ -85,9 +85,35 @@ static int right_height, left_height;
 static int right_x, right_dxdy, left_x, left_dxdy;
 static int left_z, left_dzdy;
 
-extern int imul16(int x, int y);
+int imul16(int x, int y)
-extern int imul14(int x, int y);
+{
-extern int idiv16(int x, int y);
+    int64_t result;
+    const int64_t m = (int64_t)(x);
+    const int64_t n = (int64_t)(y);
+
+    result = (m * n) >> 16;
+    return (int)(result);
+}
+
+int imul14(int x, int y)
+{
+    int64_t result;
+    const int64_t m = (int64_t)(x);
+    const int64_t n = (int64_t)(y);
+
+    result = (m * n) >> 14;
+    return (int)(result);
+}
+
+int idiv16(int x, int y)
+{
+    int64_t result;
+    const int64_t m = (int64_t)(x);
+    const int64_t n = (int64_t)(y);
+
+    result = (m << 16) / n;
+    return (int)(result);
+}
 
 __inline int iceil(int x)
 {

Source/Glide64/FixedPoint.asm.cpp

@@ -1,72 +0,0 @@
-/*
-* Glide64 - Glide video plugin for Nintendo 64 emulators.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/****************************************************************
-;
-; Glide64 - Glide Plugin for Nintendo 64 emulators
-; Project started on December 29th, 2001
-;
-; Authors:
-; Dave2001, original author, founded the project in 2001, left it in 2002
-; Gugaman, joined the project in 2002, left it in 2002
-; Sergey 'Gonetz' Lipski, joined the project in 2002, main author since fall of 2002
-; Hiroshi 'KoolSmoky' Morii, joined the project in 2007
-;
-;****************************************************************
-;
-; To modify Glide64:
-; * Write your name and (optional)email, commented by your work, so I know who did it, and so that you can find which parts you modified when it comes time to send it to me.
-; * Do NOT send me the whole project or file that you modified.  Take out your modified code sections, and tell me where to put them.  If people sent the whole thing, I would have many different versions, but no idea how to combine them all.
-;
-;****************************************************************/
-
-#if defined(_MSC_VER) && !defined(_STDINT)
-typedef signed __int64          int64_t;
-#else
-#include <stdint.h>
-#endif
-
-int imul14(int x, int y)
-{
-    int64_t result;
-    const int64_t m = (int64_t)(x);
-    const int64_t n = (int64_t)(y);
-
-    result = (m * n) >> 14;
-    return (int)(result);
-}
-
-int imul16(int x, int y)
-{
-    int64_t result;
-    const int64_t m = (int64_t)(x);
-    const int64_t n = (int64_t)(y);
-
-    result = (m * n) >> 16;
-    return (int)(result);
-}
-
-int idiv16(int x, int y)
-{
-    int64_t result;
-    const int64_t m = (int64_t)(x);
-    const int64_t n = (int64_t)(y);
-
-    result = (m << 16) / n;
-    return (int)(result);
-}

Source/Glide64/Gfx_1.3.h

@@ -90,6 +90,7 @@ the plugin
 #include <stddef.h>		// offsetof
 #include <glide.h>
 #include <Common/MemTest.h>
+#include <Common/stdtypes.h>
 #include <settings/Settings.h>
 #include "GlideExtensions.h"
 #include "rdp.h"

Source/Glide64/Glide64.vcproj

@@ -199,11 +199,11 @@
 				>
 			</File>
 			<File
-				RelativePath="Version.h"
+				RelativePath="ucodeFB.h"
 				>
 			</File>
 			<File
-				RelativePath="ucodeFB.h"
+				RelativePath="Version.h"
 				>
 			</File>
 		</Filter>
@@ -396,10 +396,6 @@
 			RelativePath="FBtoScreen.h"
 			>
 		</File>
-		<File
-			RelativePath=".\FixedPoint.asm.cpp"
-			>
-		</File>
 		<File
 			RelativePath="Gfx #1.3.h"
 			>