Linux: Fix ups for people running Linux. If it breaks anything, punch me in the face.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@30 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-07-20 11:02:41 +00:00
parent 35950043a6
commit c7795c41b7
36 changed files with 140 additions and 72 deletions

View File

@ -19,7 +19,7 @@
#define _GLOBALS_H
#include "pluginspecs_dsp.h"
#include <stdio.h>
#define WITH_DSP_ON_THREAD 1
#define DUMP_DSP_IMEM 0

View File

@ -1,5 +1,5 @@
Import('env')
output = "../../../../Binary/linux/Plugins/temp/dsplle.so"
output = "../../../../Binary/linux/Plugins/dsplle.so"
files = ["disassemble.cpp",
"gdsp_aram.cpp",
"gdsp_ext_op.cpp",
@ -11,7 +11,6 @@ files = ["disassemble.cpp",
"Globals.cpp",
"opcodes.cpp",
"Tools.cpp",
"UCode_AX.cpp",
]
#env.Append(LINKFLAGS = "-symbolic")
env.SharedLibrary(output, files)

View File

@ -28,10 +28,10 @@
HINSTANCE g_hInstance = NULL;
HANDLE g_hDSPThread = NULL;
CRITICAL_SECTION g_CriticalSection;
CDisAsmDlg g_Dialog;
#endif
DSPInitialize g_dspInitialize;
CDisAsmDlg g_Dialog;
#define GDSP_MBOX_CPU 0
#define GDSP_MBOX_DSP 1

View File

@ -237,4 +237,5 @@ void DSP_Update()
void DSP_SendAIBuffer(unsigned int _Address, unsigned int _Size)
{}
void DllDebugger(HWND _hParent)
{}

View File

@ -10,6 +10,7 @@ files = ["BPStructs.cpp",
"OpcodeDecoding.cpp",
# "OpcodeReaders.cpp", # outdated
"PixelShader.cpp",
"PixelShaderManager.cpp",
"rasterfont.cpp",
"Render.cpp",
"TextureDecoder.cpp",
@ -17,10 +18,11 @@ files = ["BPStructs.cpp",
"VertexLoader.cpp",
"VertexLoader_Normal.cpp",
"VertexShader.cpp",
"VertexShaderManager.cpp",
# "Linux/Conf.cpp",
"Linux/Linux.cpp",
]
gfxenv=env.Copy(CXXFLAGS = " `pkg-config --cflags gtk+-2.0`", LINKFLAGS = " `pkg-config --libs gtk+-2.0`")
gfxenv=env.Copy(CXXFLAGS = " `pkg-config --cflags gtk+-2.0 xxf86vm`", LINKFLAGS = " `pkg-config --libs gtk+-2.0 xxf86vm`")
gfxenv.SharedLibrary("../../../../Binary/linux/Plugins/zeroogl.so", files, LIBS=["common", "cairo", "GL", "GLEW", "CgGL", "Cg"])
gfxenv.SharedLibrary("../../../../Binary/linux/Plugins/zeroogl.so", files, LIBS=["videocommon", "common", "cairo", "GL", "GLEW", "CgGL", "Cg", "X11"])