* Sync up to trunk HEAD (r62285). Branch guys deserve the significant speedups too ;)

svn path=/branches/shell-experiments/; revision=62286
This commit is contained in:
Amine Khaldi 2014-02-22 10:31:26 +00:00
commit ddb3d908c9
1259 changed files with 40366 additions and 5588 deletions

View file

@ -35,7 +35,7 @@ list(APPEND SOURCE
getstring.c
hash.c
hint.c
histogram.c
#histogram.c
image.c
imports.c
light.c
@ -62,7 +62,7 @@ list(APPEND SOURCE
texgetimage.c
teximage.c
texobj.c
texpal.c
#texpal.c
texparam.c
texstate.c
texstorage.c
@ -72,9 +72,10 @@ list(APPEND SOURCE
version.c
viewport.c
vtxfmt.c
)
precomp.h)
add_library(mesa_main STATIC ${SOURCE})
add_pch(mesa_main precomp.h SOURCE)
if(NOT MSVC)
allow_warnings(mesa_main)
endif()

View file

@ -8,6 +8,7 @@ list(APPEND SOURCE
m_translate.c
m_vector.c
m_xform.c
)
precomp.h)
add_library(mesa_math STATIC ${SOURCE})
add_library(mesa_math STATIC ${SOURCE})
add_pch(mesa_math precomp.h SOURCE)

View file

@ -25,9 +25,10 @@ list(APPEND SOURCE
s_texture.c
s_triangle.c
s_zoom.c
)
precomp.h)
add_library(mesa_swrast STATIC ${SOURCE})
add_pch(mesa_swrast precomp.h SOURCE)
if(NOT MSVC)
allow_warnings(mesa_swrast)
endif()

View file

@ -15,6 +15,7 @@ list(APPEND SOURCE
t_vertex.c
t_vertex_generic.c
t_vertex_sse.c
)
precomp.h)
add_library(mesa_tnl STATIC ${SOURCE})
add_library(mesa_tnl STATIC ${SOURCE})
add_pch(mesa_tnl precomp.h SOURCE)

View file

@ -15,6 +15,7 @@ list(APPEND SOURCE
vbo_save_api.c
vbo_save_draw.c
vbo_save_loopback.c
)
precomp.h)
add_library(mesa_vbo STATIC ${SOURCE})
add_library(mesa_vbo STATIC ${SOURCE})
add_pch(mesa_vbo precomp.h SOURCE)

View file

@ -20,9 +20,8 @@ list(APPEND SOURCE
swimpl.c
wgl.c
wgl_font.c
${CMAKE_CURRENT_BINARY_DIR}/opengl32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/opengl32.def
)
opengl32.h
${CMAKE_CURRENT_BINARY_DIR}/opengl32_stubs.c)
set_source_files_properties(gcrt0.o libgmon.a PROPERTIES EXTERNAL_OBJECT TRUE)
@ -33,7 +32,11 @@ if(ARCH STREQUAL "i386")
)
endif()
add_library(opengl32 SHARED ${SOURCE} ${opengl32_asm})
add_library(opengl32 SHARED
${SOURCE}
${opengl32_asm}
${CMAKE_CURRENT_BINARY_DIR}/opengl32.def)
target_link_libraries(opengl32
wine
${PSEH_LIB}
@ -53,4 +56,5 @@ endif()
set_module_type(opengl32 win32dll)
add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll)
add_pch(opengl32 opengl32.h SOURCE)
add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)

View file

@ -5,7 +5,8 @@
* PURPOSE: OpenGL32 lib, general header
*/
#pragma once
#ifndef _OPENGL32_PCH_
#define _OPENGL32_PCH_
#define WIN32_NO_STATUS
#include <stdarg.h>
@ -168,3 +169,5 @@ PROC sw_GetProcAddress(LPCSTR name);
BOOL sw_CopyContext(DHGLRC dhglrcSrc, DHGLRC dhglrcDst, UINT mask);
BOOL sw_ShareLists(DHGLRC dhglrcSrc, DHGLRC dhglrcDst);
BOOL sw_SwapBuffers(HDC hdc, struct wgl_dc_data* dc_data);
#endif /* _OPENGL32_PCH_ */