[Video] Rename glide64 to Project64-video
This commit is contained in:
zilmar
parent
9efae26d0c
commit
ea009c1ca1
|
|
@ -21,10 +21,10 @@ COMMON_CPPFLAGS := \
|
|||
include $(JNI_LOCAL_PATH)/3rdParty/png/png.mk
|
||||
include $(JNI_LOCAL_PATH)/3rdParty/zlib/zlib.mk
|
||||
include $(JNI_LOCAL_PATH)/Common/common.mk
|
||||
include $(JNI_LOCAL_PATH)/Glide64/Glide64.mk
|
||||
include $(JNI_LOCAL_PATH)/PluginAudio/PluginAudio.mk
|
||||
include $(JNI_LOCAL_PATH)/PluginInput/PluginInput.mk
|
||||
include $(JNI_LOCAL_PATH)/PluginRSP/PluginRSP.mk
|
||||
include $(JNI_LOCAL_PATH)/Project64-bridge/Project64-bridge.mk
|
||||
include $(JNI_LOCAL_PATH)/Project64-core/Project64-core.mk
|
||||
include $(JNI_LOCAL_PATH)/Project64-video/Project64-video.mk
|
||||
include $(JNI_LOCAL_PATH)/Settings/Settings.mk
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
*.cpp
|
||||
*.h
|
||||
*.vcproj
|
||||
*.vcxproj
|
||||
*.vcxproj.filters
|
||||
*.dsp
|
||||
*.plg
|
||||
*.txt
|
||||
*.rc
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
###############################
|
||||
# Project64-gfx-glide64
|
||||
###############################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_PATH := $(JNI_LOCAL_PATH)
|
||||
SRCDIR := ./
|
||||
|
||||
LOCAL_MODULE := Project64-gfx-glide64
|
||||
LOCAL_STATIC_LIBRARIES := common \
|
||||
zlib \
|
||||
Settings \
|
||||
png \
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/Glitch64/inc \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/3rdParty \
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(SRCDIR)/Glitch64/OGLEScombiner.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLESgeometry.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLESglitchmain.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLEStextures.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLESwrappers.cpp \
|
||||
$(SRCDIR)/Glide64/3dmath.cpp \
|
||||
$(SRCDIR)/Glide64/Android.cpp \
|
||||
$(SRCDIR)/Glide64/Combine.cpp \
|
||||
$(SRCDIR)/Glide64/Config.cpp \
|
||||
$(SRCDIR)/Glide64/CRC.cpp \
|
||||
$(SRCDIR)/Glide64/Debugger.cpp \
|
||||
$(SRCDIR)/Glide64/DepthBufferRender.cpp \
|
||||
$(SRCDIR)/Glide64/FBtoScreen.cpp \
|
||||
$(SRCDIR)/Glide64/Main.cpp \
|
||||
$(SRCDIR)/Glide64/rdp.cpp \
|
||||
$(SRCDIR)/Glide64/ScreenResolution.cpp \
|
||||
$(SRCDIR)/Glide64/Settings.cpp \
|
||||
$(SRCDIR)/Glide64/TexBuffer.cpp \
|
||||
$(SRCDIR)/Glide64/TexCache.cpp \
|
||||
$(SRCDIR)/Glide64/trace.cpp \
|
||||
$(SRCDIR)/Glide64/Util.cpp \
|
||||
$(SRCDIR)/Glide64/Ext_TxFilter.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxFilterExport.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxFilter.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxCache.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxTexCache.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxHiResCache.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxQuantize.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxUtil.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters_2xsai.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters_hq2x.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters_hq4x.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxImage.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxReSample.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxDbg.cpp \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/fxt1.c \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/dxtn.c \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/wrapper.c \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/texstore.c \
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
$(COMMON_CFLAGS) \
|
||||
-DUSE_FRAMESKIPPER \
|
||||
-DNOSSE \
|
||||
-DUSE_GLES \
|
||||
-fsigned-char \
|
||||
|
||||
LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_LDLIBS := \
|
||||
-ldl \
|
||||
-lGLESv2 \
|
||||
-llog \
|
||||
-latomic \
|
||||
|
||||
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
||||
# Use for ARM7a:
|
||||
LOCAL_CFLAGS += -mfpu=vfp
|
||||
LOCAL_CFLAGS += -mfloat-abi=softfp
|
||||
|
||||
endif
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
*.cpp
|
||||
*.h
|
||||
*.vcproj
|
||||
*.vcxproj
|
||||
*.vcxproj.filters
|
||||
*.dsp
|
||||
*.plg
|
||||
*.txt
|
||||
*.rc
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
###############################
|
||||
# Project64-gfx-Project64
|
||||
###############################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_PATH := $(JNI_LOCAL_PATH)
|
||||
SRCDIR := ./
|
||||
|
||||
LOCAL_MODULE := Project64-gfx-Project64
|
||||
LOCAL_STATIC_LIBRARIES := common \
|
||||
zlib \
|
||||
Settings \
|
||||
png \
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/Project64-video/Renderer/inc \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/3rdParty \
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(SRCDIR)/Project64-video/3dmath.cpp \
|
||||
$(SRCDIR)/Project64-video/Android.cpp \
|
||||
$(SRCDIR)/Project64-video/Combine.cpp \
|
||||
$(SRCDIR)/Project64-video/Config.cpp \
|
||||
$(SRCDIR)/Project64-video/CRC.cpp \
|
||||
$(SRCDIR)/Project64-video/Debugger.cpp \
|
||||
$(SRCDIR)/Project64-video/DepthBufferRender.cpp \
|
||||
$(SRCDIR)/Project64-video/FBtoScreen.cpp \
|
||||
$(SRCDIR)/Project64-video/Main.cpp \
|
||||
$(SRCDIR)/Project64-video/rdp.cpp \
|
||||
$(SRCDIR)/Project64-video/ScreenResolution.cpp \
|
||||
$(SRCDIR)/Project64-video/Settings.cpp \
|
||||
$(SRCDIR)/Project64-video/TexBuffer.cpp \
|
||||
$(SRCDIR)/Project64-video/TexCache.cpp \
|
||||
$(SRCDIR)/Project64-video/trace.cpp \
|
||||
$(SRCDIR)/Project64-video/Util.cpp \
|
||||
$(SRCDIR)/Project64-video/Ext_TxFilter.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLEScombiner.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLESgeometry.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLESglitchmain.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLEStextures.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLESwrappers.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxFilterExport.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxFilter.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxCache.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxTexCache.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxHiResCache.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxQuantize.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxUtil.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters_2xsai.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters_hq2x.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters_hq4x.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxImage.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxReSample.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxDbg.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/fxt1.c \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/dxtn.c \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/wrapper.c \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/texstore.c \
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
$(COMMON_CFLAGS) \
|
||||
-DUSE_FRAMESKIPPER \
|
||||
-DNOSSE \
|
||||
-DUSE_GLES \
|
||||
-fsigned-char \
|
||||
|
||||
LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_LDLIBS := \
|
||||
-ldl \
|
||||
-lGLESv2 \
|
||||
-llog \
|
||||
-latomic \
|
||||
|
||||
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
||||
# Use for ARM7a:
|
||||
LOCAL_CFLAGS += -mfpu=vfp
|
||||
LOCAL_CFLAGS += -mfloat-abi=softfp
|
||||
|
||||
endif
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2010 or later
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}"
|
||||
EndProject
|
||||
|
|
@ -31,12 +31,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64Setup", "Source\In
|
|||
{FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Glide64\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Glitch64\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{181AA451-63A7-4E3B-BE0C-F92BE3F3D2F2}"
|
||||
|
|
@ -62,6 +56,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginRSP", "Source\Android
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JniBridge", "Source\Android\Bridge\Bridge.vcxproj", "{593B00E6-1987-415D-A62C-26533FC3E95C}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Project64-video\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Project64-video\Renderer\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\Project64-video\TextureEnhancer\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
|
|
@ -131,30 +131,6 @@ Global
|
|||
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.Build.0 = Release|Win32
|
||||
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|x64.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.Build.0 = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.Build.0 = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.Build.0 = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.Build.0 = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.Build.0 = Release|x64
|
||||
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -203,6 +179,30 @@ Global
|
|||
{593B00E6-1987-415D-A62C-26533FC3E95C}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{593B00E6-1987-415D-A62C-26533FC3E95C}.Release|Win32.Build.0 = Release|Win32
|
||||
{593B00E6-1987-415D-A62C-26533FC3E95C}.Release|x64.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.Build.0 = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.Build.0 = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.Build.0 = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.Build.0 = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -211,13 +211,13 @@ Global
|
|||
{3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{17836496-31B0-46F2-B1B1-366D7DF6F04C} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{D233025A-231F-4A43-92B6-E87193C60ACC} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{1133A1CC-A9E5-4026-B20D-6A2987130D4E} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{B685BB34-D700-4FCC-8503-9B6AA1A0C95D} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{593B00E6-1987-415D-A62C-26533FC3E95C} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
#include "Util.h"
|
||||
#include "Combine.h"
|
||||
#include "trace.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
#define FASTSEARCH // Enable fast combine mode searching algorithm
|
||||
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
#include "Gfx_1.3.h"
|
||||
#include "FBtoScreen.h"
|
||||
#include "TexCache.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
static int SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaque)
|
||||
{
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(Root)Source/Glitch64/inc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(Root)Source/Project64-video/Renderer/inc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Platform)'=='x64'">NO_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
|
@ -133,21 +133,22 @@
|
|||
<ProjectReference Include="..\3rdParty\png\png.vcxproj">
|
||||
<Project>{17836496-31b0-46f2-b1b1-366d7df6f04c}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\3rdParty\zlib\zlib.vcxproj">
|
||||
<Project>{731bd205-2826-4631-b7af-117658e88dbc}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Common\Common.vcxproj">
|
||||
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GlideHQ\GlideHQ.vcxproj">
|
||||
<Project>{2daddaa5-0f57-46ed-a974-747908ddc7f3}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Glitch64\Glitch64.vcxproj">
|
||||
<Project>{462c2608-182f-452c-944f-af201e19300b}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Settings\Settings.vcxproj">
|
||||
<Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="Renderer\Glitch64.vcxproj">
|
||||
<Project>{462c2608-182f-452c-944f-af201e19300b}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="TextureEnhancer\GlideHQ.vcxproj">
|
||||
<Project>{2daddaa5-0f57-46ed-a974-747908ddc7f3}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include <stdlib.h>
|
||||
#include "glide.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
static int fct[4], source0[4], operand0[4], source1[4], operand1[4], source2[4], operand2[4];
|
||||
static int fcta[4], sourcea0[4], operanda0[4], sourcea1[4], operanda1[4], sourcea2[4], operanda2[4];
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#endif // _WIN32
|
||||
#include "glide.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
#define Z_MAX (65536.0f)
|
||||
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#include "glide.h"
|
||||
#include "g3ext.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
#include <Common/Util.h>
|
||||
|
||||
#ifdef VPDEBUG
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
#include "glitchmain.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
/* Napalm extensions to GrTextureFormat_t */
|
||||
#define GR_TEXFMT_ARGB_CMP_FXT1 0x11
|
||||
|
|
@ -11,7 +11,7 @@ void dump_stop();
|
|||
extern int dumping;
|
||||
#endif
|
||||
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
#define zscale 1.0f
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include <Common/StdString.h>
|
||||
#include <Settings/Settings.h>
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
#include "Gfx_1.3.h"
|
||||
#include "ScreenResolution.h"
|
||||
#include "SettingsID.h"
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
#include "Gfx_1.3.h"
|
||||
#include "TexBuffer.h"
|
||||
#include "CRC.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
static TBUFF_COLOR_IMAGE * AllocateTextureBuffer(COLOR_IMAGE & cimage)
|
||||
{
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#include "Combine.h"
|
||||
#include "Util.h"
|
||||
#include <Common/Util.h>
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
void LoadTex(int id, int tmu);
|
||||
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
#include <stdarg.h>
|
||||
#include <Common/StdString.h>
|
||||
#include <Common/path.h>
|
||||
#include <Glide64/Config.h>
|
||||
#include <Glide64/Settings.h>
|
||||
#include <Project64-video/Config.h>
|
||||
#include <Project64-video/Settings.h>
|
||||
|
||||
TxDbg::TxDbg()
|
||||
{
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue