ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Fix up Project64-video.mk

This commit is contained in:
zilmar 2017-05-18 09:12:34 +10:00
parent 99173496c2
commit 5391965400
7 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Android/jni/Project64-video/Project64-video.mk
View File

@ -31,6 +31,20 @@ LOCAL_SRC_FILES := \
$(SRCDIR)/Project64-video/TexBuffer.cpp \ $(SRCDIR)/Project64-video/TexBuffer.cpp \
$(SRCDIR)/Project64-video/TexCache.cpp \ $(SRCDIR)/Project64-video/TexCache.cpp \
$(SRCDIR)/Project64-video/trace.cpp \ $(SRCDIR)/Project64-video/trace.cpp \
$(SRCDIR)/Project64-video/turbo3D.cpp \
$(SRCDIR)/Project64-video/ucode.cpp \
$(SRCDIR)/Project64-video/ucode00.cpp \
$(SRCDIR)/Project64-video/ucode01.cpp \
$(SRCDIR)/Project64-video/ucode02.cpp \
$(SRCDIR)/Project64-video/ucode03.cpp \
$(SRCDIR)/Project64-video/ucode04.cpp \
$(SRCDIR)/Project64-video/ucode05.cpp \
$(SRCDIR)/Project64-video/ucode06.cpp \
$(SRCDIR)/Project64-video/ucode07.cpp \
$(SRCDIR)/Project64-video/ucode08.cpp \
$(SRCDIR)/Project64-video/ucode09.cpp \
$(SRCDIR)/Project64-video/ucode09rdp.cpp \
$(SRCDIR)/Project64-video/ucodeFB.cpp \
$(SRCDIR)/Project64-video/Util.cpp \ $(SRCDIR)/Project64-video/Util.cpp \
$(SRCDIR)/Project64-video/Ext_TxFilter.cpp \ $(SRCDIR)/Project64-video/Ext_TxFilter.cpp \
$(SRCDIR)/Project64-video/Renderer/OGLEScombiner.cpp \ $(SRCDIR)/Project64-video/Renderer/OGLEScombiner.cpp \
@ -38,6 +52,7 @@ LOCAL_SRC_FILES := \
$(SRCDIR)/Project64-video/Renderer/OGLESglitchmain.cpp \ $(SRCDIR)/Project64-video/Renderer/OGLESglitchmain.cpp \
$(SRCDIR)/Project64-video/Renderer/OGLEStextures.cpp \ $(SRCDIR)/Project64-video/Renderer/OGLEStextures.cpp \
$(SRCDIR)/Project64-video/Renderer/OGLESwrappers.cpp \ $(SRCDIR)/Project64-video/Renderer/OGLESwrappers.cpp \
$(SRCDIR)/Project64-video/Renderer/Renderer.cpp \
$(SRCDIR)/Project64-video/TextureEnhancer/TxFilterExport.cpp \ $(SRCDIR)/Project64-video/TextureEnhancer/TxFilterExport.cpp \
$(SRCDIR)/Project64-video/TextureEnhancer/TxFilter.cpp \ $(SRCDIR)/Project64-video/TextureEnhancer/TxFilter.cpp \
$(SRCDIR)/Project64-video/TextureEnhancer/TxCache.cpp \ $(SRCDIR)/Project64-video/TextureEnhancer/TxCache.cpp \

1
Source/Project64-video/Gfx_1.3.h
View File

@ -12,7 +12,6 @@
* * * *
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include "winlnxdefs.h"
#include <stdio.h> #include <stdio.h>
#include <fstream> #include <fstream>

1
Source/Project64-video/Renderer/OGLESgeometry.cpp
View File

@ -19,7 +19,6 @@
#endif // _WIN32 #endif // _WIN32
#include "glide.h" #include "glide.h"
#include "glitchmain.h" #include "glitchmain.h"
#include <Project64-video/winlnxdefs.h>
#include <Project64-video/rdp.h> #include <Project64-video/rdp.h>
#include <Project64-video/trace.h> #include <Project64-video/trace.h>

1
Source/Project64-video/Renderer/OGLEStextures.cpp
View File

@ -20,6 +20,7 @@
#include "glitchmain.h" #include "glitchmain.h"
#include <stdio.h> #include <stdio.h>
#include <Project64-video/trace.h> #include <Project64-video/trace.h>
#include <Project64-video/Renderer/Renderer.h>
int TMU_SIZE = 8 * 2048 * 2048; int TMU_SIZE = 8 * 2048 * 2048;

1
Source/Project64-video/TextureEnhancer/TxUtil.h
View File

@ -14,7 +14,6 @@
#ifndef __TXUTIL_H__ #ifndef __TXUTIL_H__
#define __TXUTIL_H__ #define __TXUTIL_H__
#include <Common/stdtypes.h>
/* maximum number of CPU cores allowed */ /* maximum number of CPU cores allowed */
#define MAX_NUMCORE 8 #define MAX_NUMCORE 8

2
Source/Project64-video/resource.h
View File

@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by Glide64.rc // Used by Project64-video.rc
// //
#define IDD_CONFIG_BASIC 101 #define IDD_CONFIG_BASIC 101
#define IDD_EMULATION_SETTINGS 102 #define IDD_EMULATION_SETTINGS 102

50
Source/Project64-video/winlnxdefs.h
View File

@ -1,50 +0,0 @@
/*
* Glide64 - Glide video plugin for Nintendo 64 emulators.
* Copyright (c) 2002 Dave2001
* Copyright (c) 2003-2009 Sergey 'Gonetz' Lipski
* Copyright (c) 2012-2013 balrog, wahrhaft
*
* 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
*/
#ifndef WINLNXDEFS_H
#define WINLNXDEFS_H
#include <Common/stdtypes.h>
#ifndef _WIN32
typedef union _LARGE_INTEGER
{
struct
{
uint32_t LowPart;
uint32_t HighPart;
} s;
struct
{
uint32_t LowPart;
uint32_t HighPart;
} u;
long long QuadPart;
} LARGE_INTEGER, *PLARGE_INTEGER;
#define WINAPI
#endif
#endif