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

GSdx: Correct the sdl library output name, and add sdl to the main codeblocks workspace. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4366 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2011-02-26 03:05:31 +00:00
parent 4adb41f3d9
commit 49568c3d85
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp vendored
View File

@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option output="../../../deps/debug/libSDL-1.3" prefix_auto="1" extension_auto="1" /> <Option output="../../../deps/debug/libSDL-1.3.a" prefix_auto="0" extension_auto="0" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="obj/Debug/" /> <Option object_output="obj/Debug/" />
<Option type="2" /> <Option type="2" />
@ -19,7 +19,7 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="../../../deps/release/libSDL-1.3" prefix_auto="1" extension_auto="1" /> <Option output="../../../deps/release/libSDL-1.3.a" prefix_auto="0" extension_auto="0" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="obj/Release/" /> <Option object_output="obj/Release/" />
<Option type="2" /> <Option type="2" />

1
pcsx2-codeblocks.workspace
View File

@ -29,5 +29,6 @@
</Project> </Project>
<Project filename="plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp" /> <Project filename="plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp" />
<Project filename="plugins/GSdx/GSdx.gcc.cbp" active="1" /> <Project filename="plugins/GSdx/GSdx.gcc.cbp" active="1" />
<Project filename="3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

1
plugins/GSdx/stdafx.h
View File

@ -112,6 +112,7 @@ using namespace stdext;
#ifdef __GNUC__ #ifdef __GNUC__
#include "assert.h"
#define __forceinline __inline__ __attribute__((always_inline,unused)) #define __forceinline __inline__ __attribute__((always_inline,unused))
// #define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) // #define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
#define __assume(c) ((void)0) #define __assume(c) ((void)0)