Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made all plugins build with correct names and paths. (windows). for some reason njoy and padsimple don't show that they have been compiled with debugfast in their name, not sure why.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@733 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-09-30 01:09:02 +00:00
parent d98c60a0da
commit 6178eae001
10 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj
+3 -3
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Plugin_DSP_HLE"
ProjectGUID="{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}"
RootNamespace="Plugin_DSP"
@@ -426,7 +426,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLE_DF.dll"
OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLEDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
@@ -516,7 +516,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLE_DF.dll"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLEDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Plugin_DSP_LLE"
ProjectGUID="{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}"
RootNamespace="Plugin_DSP_LLE"
@@ -507,7 +507,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LEEDF.dll"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LLEDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
+4 -4
View File
@@ -137,10 +137,10 @@ void* dsp_thread_debug(void* lpParameter)
#endif
{
if (g_hDSPThread)
{
return NULL;
}
//if (g_hDSPThread)
//{
// return NULL;
//}
#ifdef _WIN32
while (1)
{
Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj
+2 -2
View File
@@ -421,7 +421,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_NULL_DF.dll"
OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_NULLDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
@@ -510,7 +510,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_NULL_DF.dll"
OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_NULLDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj
+2 -2
View File
@@ -87,7 +87,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib comctl32.lib"
OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimple.dll"
OutputFile="..\..\..\Binary\Win32\plugins\Plugin_PadSimple.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
@@ -485,7 +485,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib comctl32.lib"
OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimpleDF.dll"
OutputFile="..\..\..\Binary\Win32\plugins\Plugin_PadSimpleDF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
+2 -2
View File
@@ -94,7 +94,7 @@
Name="VCLinkerTool"
AdditionalOptions="&quot;..\..\core\common\win32\release\common.lib&quot;"
AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"
OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9.dll"
OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_VideoDX9.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
@@ -506,7 +506,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"
OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9DF.dll"
OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_VideoDX9DF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+3 -3
View File
@@ -92,7 +92,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib"
OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGL.dll"
OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_VideoOGL.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
@@ -509,7 +509,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib"
OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGLDF.dll"
OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_VideoOGLDF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
@@ -620,7 +620,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib"
OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGL.dll"
OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGLDF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj
+3 -3
View File
@@ -151,7 +151,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib winmm.lib rpcrt4.lib"
OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_WiimoteD.dll"
OutputFile="..\..\..\Binary\x64\Plugins\Plugin_WiimoteD.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
@@ -451,7 +451,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\Core\Common\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;DEBUGFAST"
RuntimeLibrary="0"
WarningLevel="3"
WarnAsError="false"
@@ -470,7 +470,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib rpcrt4.lib"
OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_WiimoteDF.dll"
OutputFile="..\..\..\Binary\x64\Plugins\Plugin_WiimoteDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
+3 -3
View File
@@ -67,7 +67,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib"
OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName)d.dll"
OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName)D.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32"
GenerateManifest="false"
@@ -147,7 +147,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Rpcrt4.lib"
OutputFile="..\..\..\Binary\x64\Plugins\$(ProjectName)d.dll"
OutputFile="..\..\..\Binary\x64\Plugins\$(ProjectName)D.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\Externals\SDL\x64"
GenerateManifest="false"
@@ -384,7 +384,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib"
OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName)df.dll"
OutputFile="..\..\..\Binary\Win32\Plugins\$(ProjectName)DF.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\Externals\SDL\win32"
GenerateManifest="false"
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+9 -5
View File
@@ -146,11 +146,15 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
_PluginInfo->Version = 0x0100;
_PluginInfo->Type = PLUGIN_TYPE_PAD;
#ifndef _DEBUG
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION " by Falcon4ever");
#else
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (Debug) by Falcon4ever");
#endif
#ifdef DEBUGFAST
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (DebugFast) by Falcon4ever");
#else
#ifndef _DEBUG
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION " by Falcon4ever");
#else
sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (Debug) by Falcon4ever");
#endif
#endif
}
// Call about dialog