Fix *BSD build.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7002 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-31 03:02:23 +00:00
parent fec5ed92ff
commit 8822674653
21 changed files with 36 additions and 34 deletions

View File

@ -129,6 +129,7 @@ if sys.platform == 'darwin':
env['FRAMEWORKS'] += ['AudioToolbox', 'AudioUnit', 'CoreAudio', 'WebKit']
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-dead_strip']
env['LINKFLAGS'] += ['-Wl,-pagezero_size,0x1000']
env['LINKFLAGS'] += ['-Wl,-search_paths_first']
@ -170,7 +171,7 @@ elif sys.platform == 'win32':
pass
else:
env['CCFLAGS'] += ['-fPIC', '-msse2', '-pthread']
env['CCFLAGS'] += ['-msse2', '-pthread']
if env['CCVERSION'] >= '4.2.0':
env['CCFLAGS'] += ['-fvisibility=hidden']
env['CXXFLAGS'] += ['-fvisibility-inlines-hidden']

View File

@ -15,7 +15,6 @@ set(SRCS Src/ABI.cpp
Src/Misc.cpp
Src/MsgHandler.cpp
Src/NandPaths.cpp
Src/OpenCL.cpp
Src/SDCardUtil.cpp
Src/StringUtil.cpp
Src/SymbolDB.cpp
@ -24,7 +23,6 @@ set(SRCS Src/ABI.cpp
Src/Thunk.cpp
Src/Timer.cpp
Src/Version.cpp
Src/VideoBackendBase.cpp
Src/x64Analyzer.cpp
Src/x64Emitter.cpp
Src/Crypto/aes_cbc.cpp

View File

@ -705,14 +705,6 @@
RelativePath=".\Src\NandPaths.h"
>
</File>
<File
RelativePath=".\Src\OpenCL.cpp"
>
</File>
<File
RelativePath=".\Src\OpenCL.h"
>
</File>
<File
RelativePath="..\..\PluginSpecs\PluginSpecs.h"
>
@ -853,14 +845,6 @@
RelativePath=".\Src\Version.cpp"
>
</File>
<File
RelativePath=".\Src\VideoBackendBase.cpp"
>
</File>
<File
RelativePath=".\Src\VideoBackendBase.h"
>
</File>
<File
RelativePath=".\Src\x64Analyzer.cpp"
>

View File

@ -254,7 +254,6 @@
<ClCompile Include="Src\Misc.cpp" />
<ClCompile Include="Src\MsgHandler.cpp" />
<ClCompile Include="Src\NandPaths.cpp" />
<ClCompile Include="Src\OpenCL.cpp" />
<ClCompile Include="Src\SDCardUtil.cpp" />
<ClCompile Include="Src\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@ -271,7 +270,6 @@
<ClCompile Include="Src\Thunk.cpp" />
<ClCompile Include="Src\Timer.cpp" />
<ClCompile Include="Src\Version.cpp" />
<ClCompile Include="Src\VideoBackendBase.cpp" />
<ClCompile Include="Src\x64Analyzer.cpp" />
<ClCompile Include="Src\x64Emitter.cpp" />
</ItemGroup>
@ -311,8 +309,6 @@
<ClInclude Include="Src\MemoryUtil.h" />
<ClInclude Include="Src\MsgHandler.h" />
<ClInclude Include="Src\NandPaths.h" />
<ClInclude Include="Src\OpenCL.h" />
<ClInclude Include="Src\VideoBackendBase.h" />
<ClInclude Include="Src\SDCardUtil.h" />
<ClInclude Include="Src\Setup.h" />
<ClInclude Include="Src\stdafx.h" />
@ -334,4 +330,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -29,7 +29,6 @@ files = [
"Misc.cpp",
"MsgHandler.cpp",
"NandPaths.cpp",
"OpenCL.cpp",
"SDCardUtil.cpp",
"StringUtil.cpp",
"SymbolDB.cpp",
@ -38,7 +37,6 @@ files = [
"Thunk.cpp",
"Timer.cpp",
"Version.cpp",
"VideoBackendBase.cpp",
"x64Emitter.cpp",
"x64Analyzer.cpp",
"Crypto/aes_cbc.cpp",

View File

@ -16,6 +16,7 @@ set(SRCS Src/ActionReplay.cpp
Src/State.cpp
Src/stdafx.cpp
Src/Tracer.cpp
Src/VideoBackendBase.cpp
Src/VolumeHandler.cpp
Src/Boot/Boot_BS2Emu.cpp
Src/Boot/Boot.cpp

View File

@ -2061,6 +2061,14 @@
RelativePath=".\Src\Tracer.h"
>
</File>
<File
RelativePath=".\Src\VideoBackendBase.cpp"
>
</File>
<File
RelativePath=".\Src\VideoBackendBase.h"
>
</File>
<File
RelativePath=".\Src\VolumeHandler.cpp"
>

View File

@ -449,6 +449,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Src\Tracer.cpp" />
<ClCompile Include="Src\VideoBackendBase.cpp" />
<ClCompile Include="Src\VolumeHandler.cpp" />
</ItemGroup>
<ItemGroup>
@ -613,6 +614,7 @@
<ClInclude Include="Src\State.h" />
<ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\Tracer.h" />
<ClInclude Include="Src\VideoBackendBase.h" />
<ClInclude Include="Src\VolumeHandler.h" />
</ItemGroup>
<ItemGroup>
@ -642,4 +644,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -19,6 +19,7 @@ files = [
"LuaInterface.cpp",
"State.cpp",
"Tracer.cpp",
"VideoBackendBase.cpp",
"VolumeHandler.cpp",
"Boot/Boot.cpp",
"Boot/Boot_BS2Emu.cpp",

View File

@ -56,7 +56,7 @@ else:
env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx', 'videouicommon']
wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx']
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
@ -136,4 +136,7 @@ else:
libs = wxlibs + libs + env['LIBS']
linkflags = ldflags + env['LINKFLAGS']
if env['HAVE_WX']:
libs += ['videouicommon']
env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags)

View File

@ -36,6 +36,7 @@ set(SRCS Src/BPMemory.cpp
Src/XFBConvert.cpp
Src/XFMemory.cpp
Src/XFStructs.cpp
Src/OpenCL.cpp)
Src/OpenCL/OCLTextureDecoder.cpp)
if(wxWidgets_FOUND AND WIN32)

View File

@ -25,8 +25,6 @@
#include "VideoBackendBase.h"
#include "Core.h"
int OSDChoice = 0 , OSDTime = 0, OSDInternalW = 0, OSDInternalH = 0;
namespace EmuWindow
{
HWND m_hWnd = NULL;

View File

@ -40,7 +40,7 @@
// TODO: Move these out of here.
int frameCount;
//int OSDChoice, OSDTime, OSDInternalW, OSDInternalH;
int OSDChoice, OSDTime;
Renderer *g_renderer;

View File

@ -18,6 +18,7 @@ files = [
'MainBase.cpp',
'OnScreenDisplay.cpp',
'OpcodeDecoding.cpp',
'OpenCL.cpp',
'OpenCL/OCLTextureDecoder.cpp',
'PixelEngine.cpp',
'PixelShaderGen.cpp',

View File

@ -712,6 +712,14 @@
<Filter
Name="OpenCL"
>
<File
RelativePath=".\Src\OpenCL.cpp"
>
</File>
<File
RelativePath=".\Src\OpenCL.h"
>
</File>
<File
RelativePath=".\Src\OpenCL\OCLTextureDecoder.cpp"
>

View File

@ -248,6 +248,7 @@
<ClCompile Include="Src\memcpy_amd.cpp" />
<ClCompile Include="Src\OnScreenDisplay.cpp" />
<ClCompile Include="Src\OpcodeDecoding.cpp" />
<ClCompile Include="Src\OpenCL.cpp" />
<ClCompile Include="Src\OpenCL\OCLTextureDecoder.cpp" />
<ClCompile Include="Src\PixelEngine.cpp" />
<ClCompile Include="Src\PixelShaderGen.cpp" />
@ -293,6 +294,7 @@
<ClInclude Include="Src\NativeVertexFormat.h" />
<ClInclude Include="Src\OnScreenDisplay.h" />
<ClInclude Include="Src\OpcodeDecoding.h" />
<ClInclude Include="Src\OpenCL.h" />
<ClInclude Include="Src\OpenCL\OCLTextureDecoder.h" />
<ClInclude Include="Src\PixelEngine.h" />
<ClInclude Include="Src\PixelShaderGen.h" />
@ -350,4 +352,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -96,9 +96,9 @@ CGprofile g_cgfProf;
#endif
#ifdef _WIN32
extern int OSDChoice, OSDTime, OSDInternalW, OSDInternalH;
extern int OSDInternalW, OSDInternalH;
#else
int OSDChoice, OSDTime, OSDInternalW, OSDInternalH;
int OSDInternalW, OSDInternalH;
#endif
namespace OGL