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

zzogl-pg: Add a preliminary codeblocks project file. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2741 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-03-19 01:00:53 +00:00
parent 0edf2d26e7
commit 50bddb85d5
6 changed files with 141 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2-codeblocks.workspace
View File

@ -30,5 +30,6 @@
<Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp"> <Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp">
<Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" /> <Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" />
</Project> </Project>
<Project filename="plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

12
plugins/zzogl-pg/opengl/GSmain.cpp
View File

@ -66,22 +66,22 @@ const char* SaveStateFile = NULL; // Name of SaveFile for access check.
// statistics // statistics
u32 g_nGenVars = 0, g_nTexVars = 0, g_nAlphaVars = 0, g_nResolve = 0; u32 g_nGenVars = 0, g_nTexVars = 0, g_nAlphaVars = 0, g_nResolve = 0;
#define VER 21 #define VER 1
const unsigned char zgsversion = PS2E_GS_VERSION; const unsigned char zgsversion = PS2E_GS_VERSION;
unsigned char zgsrevision = 0; // revision and build gives plugin version unsigned char zgsrevision = 0; // revision and build gives plugin version
unsigned char zgsbuild = VER; unsigned char zgsbuild = VER;
unsigned char zgsminor = 209; unsigned char zgsminor = 0;
#ifdef _DEBUG #ifdef _DEBUG
char *libraryName = "ZZ Ogl (Debug) "; char *libraryName = "ZZ Ogl PG (Debug) ";
#elif defined(RELEASE_TO_PUBLIC) #elif defined(RELEASE_TO_PUBLIC)
char *libraryName = "ZZ Ogl "; char *libraryName = "ZZ Ogl PG ";
#else #else
char *libraryName = "ZZ Ogl (Dev) "; char *libraryName = "ZZ Ogl PG (Dev) ";
#endif #endif
static const char* s_aa[5] = { "AA none |", "AA 2x |", "AA 4x |", "AA 8x |", "AA 16x |" }; static const char* s_aa[5] = { "AA none |", "AA 2x |", "AA 4x |", "AA 8x |", "AA 16x |" };
static const char* s_naa[3] = { "nattive res |", "res /2 |", "res /4 |" }; static const char* s_naa[3] = { "native res |", "res /2 |", "res /4 |" };
static const char* pbilinear[] = { "off", "normal", "forced" }; static const char* pbilinear[] = { "off", "normal", "forced" };
extern GIFRegHandler g_GIFPackedRegHandlers[]; extern GIFRegHandler g_GIFPackedRegHandlers[];

4
plugins/zzogl-pg/opengl/Linux/Conf.cpp
View File

@ -26,7 +26,7 @@
void SaveConfig() void SaveConfig()
{ {
const std::string iniFile( s_strIniPath + "zerogs.ini" ); const std::string iniFile( s_strIniPath + "zzogl-pg.ini" );
FILE* f = fopen(iniFile.c_str(),"w"); FILE* f = fopen(iniFile.c_str(),"w");
if (f == NULL) if (f == NULL)
@ -57,7 +57,7 @@ void LoadConfig()
conf.height = 480; conf.height = 480;
conf.aa = 0; conf.aa = 0;
const std::string iniFile( s_strIniPath + "zerogs.ini" ); const std::string iniFile( s_strIniPath + "zzogl-pg.ini" );
FILE* f = fopen(iniFile.c_str(), "r"); FILE* f = fopen(iniFile.c_str(), "r");
if (f == NULL) if (f == NULL)
{ {

129
plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp Normal file
View File

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="ZZOgl-PG" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="../../../../../bin/plugins/ZZOgl-PG-d.so" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release">
<Option output="../../../../../bin/plugins/ZZOgl-PG" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" />
<Option type="3" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="-m32" />
<Add option="-I/opt/cg/include -L/opt/cg/lib" />
<Add directory="../../Linux" />
<Add directory="../../../opengl" />
<Add directory="../../../../../common/include" />
<Add directory="../../../../../3rdparty" />
</Compiler>
<Linker>
<Add option="`pkg-config gtk+-2.0 --libs`" />
<Add option="-shared" />
<Add library="GL" />
<Add library="X11" />
<Add library="CgGL" />
<Add library="jpeg" />
<Add library="GLEW" />
<Add library="GLU" />
<Add library="Xxf86vm" />
<Add library="z" />
<Add library="dl" />
<Add library="stdc++" />
<Add library="Cg" />
</Linker>
<Unit filename="../../GS.h" />
<Unit filename="../../GSmain.cpp" />
<Unit filename="../Conf.cpp" />
<Unit filename="../Linux.cpp" />
<Unit filename="../Linux.h" />
<Unit filename="../callbacks.h" />
<Unit filename="../interface.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../interface.h" />
<Unit filename="../support.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../support.h" />
<Unit filename="../zerogs.glade" />
<Unit filename="../../Mem.cpp" />
<Unit filename="../../Mem.h" />
<Unit filename="../../Regs.cpp" />
<Unit filename="../../Regs.h" />
<Unit filename="../../Win32/Conf.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="../../Win32/Win32.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="../../Win32/Win32.h" />
<Unit filename="../../Win32/aviUtil.h" />
<Unit filename="../../Win32/jconfig.h" />
<Unit filename="../../Win32/jmorecfg.h" />
<Unit filename="../../Win32/jpeglib.h" />
<Unit filename="../../Win32/resource.h" />
<Unit filename="../../Win32/resrc1.h" />
<Unit filename="../../Win32/wglext.h" />
<Unit filename="../../Win32/zerogs.rc">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="../../ZZoglCRTC.cpp" />
<Unit filename="../../ZZoglCreate.cpp" />
<Unit filename="../../ZZoglFlush.cpp" />
<Unit filename="../../ZZoglSave.cpp" />
<Unit filename="../../ZZoglShaders.cpp" />
<Unit filename="../../ZZoglShoots.cpp" />
<Unit filename="../../ZZoglVB.cpp" />
<Unit filename="../../common.h" />
<Unit filename="../../glprocs.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../glprocs.h" />
<Unit filename="../../memcpy_amd.cpp" />
<Unit filename="../../rasterfont.cpp" />
<Unit filename="../../rasterfont.h" />
<Unit filename="../../targets.cpp" />
<Unit filename="../../targets.h" />
<Unit filename="../../x86-32.S" />
<Unit filename="../../x86.cpp" />
<Unit filename="../../x86.h" />
<Unit filename="../../zerogs.cpp" />
<Unit filename="../../zerogs.h" />
<Unit filename="../../zerogsmath.h" />
<Unit filename="../../zpipe.cpp" />
<Unit filename="../../zpipe.h" />
<Extensions>
<code_completion />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>

4
plugins/zzogl-pg/opengl/Win32/Conf.cpp
View File

@ -9,7 +9,7 @@ extern HINSTANCE hInst;
void SaveConfig() { void SaveConfig() {
char szValue[256]; char szValue[256];
const std::string iniFile( s_strIniPath + "zerogs.ini" ); const std::string iniFile( s_strIniPath + "zzogl-pg.ini" );
sprintf(szValue,"%u",conf.interlace); sprintf(szValue,"%u",conf.interlace);
WritePrivateProfileString("Settings", "Interlace",szValue,iniFile.c_str()); WritePrivateProfileString("Settings", "Interlace",szValue,iniFile.c_str());
@ -25,7 +25,7 @@ void SaveConfig() {
void LoadConfig() { void LoadConfig() {
char szValue[256]; char szValue[256];
const std::string iniFile( s_strIniPath + "zerogs.ini" ); const std::string iniFile( s_strIniPath + "zzogl-pg.ini" );
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
conf.interlace = 0; // on, mode 1 conf.interlace = 0; // on, mode 1

2
plugins/zzogl-pg/opengl/ZZoglCreate.cpp
View File

@ -594,7 +594,7 @@ inline bool ZeroGS::CreateOpenShadersFile() {
FILE* f = fopen(EFFECT_NAME, "r"); FILE* f = fopen(EFFECT_NAME, "r");
if( f == NULL ) { if( f == NULL ) {
strcpy(tempstr, "../../plugins/ZZOgl/opengl/"); strcpy(tempstr, "../../plugins/zzogl-pg/opengl/");
sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr); sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
f = fopen(EFFECT_NAME, "r"); f = fopen(EFFECT_NAME, "r");