From 91d0292a0398058a99174ead7233f50b1b432317 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 16 Jul 2013 10:54:11 -0500 Subject: [PATCH 01/10] Add support for parsing ANGLE and REGAL specs from glew branch of git repo. --- auto/bin/filter_gl_ext.sh | 25 + auto/core/gl/GL_REGAL_ES1_0_compatibility | 35 - auto/core/gl/GL_REGAL_ES1_1_compatibility | 16 - auto/core/gl/GL_REGAL_enable | 8 - auto/core/gl/GL_REGAL_error_string | 4 - auto/core/gl/GL_REGAL_extension_query | 5 - auto/core/gl/GL_REGAL_log | 14 - doc/glew.html | 897 +++++++++++----------- 8 files changed, 480 insertions(+), 524 deletions(-) delete mode 100644 auto/core/gl/GL_REGAL_ES1_0_compatibility delete mode 100644 auto/core/gl/GL_REGAL_ES1_1_compatibility delete mode 100644 auto/core/gl/GL_REGAL_enable delete mode 100644 auto/core/gl/GL_REGAL_error_string delete mode 100644 auto/core/gl/GL_REGAL_extension_query delete mode 100644 auto/core/gl/GL_REGAL_log diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index ee2662f..7b2350e 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -430,6 +430,23 @@ EOT typedef int GLfixed EOT +# Append GLclampx to GL_REGAL_ES1_0_compatibility +# Probably ought to be explicitly mentioned in the spec language + + cat >> $1/GL_REGAL_ES1_0_compatibility <> $1/GL_REGAL_log < GLLOGPROCREGAL + perl -e 's/LOGPROCREGAL/GLLOGPROCREGAL/g' -pi $1/GL_REGAL_log + # Filter out GL_BYTE from GL_OES_byte_coordinates grep -v 'GL_BYTE' $1/GL_OES_byte_coordinates > tmp mv tmp $1/GL_OES_byte_coordinates @@ -438,5 +455,13 @@ EOT egrep -v 'glProgramUniform.*[1234]d[v]?EXT' $1/GL_EXT_direct_state_access > tmp mv tmp $1/GL_EXT_direct_state_access +# Filter out all enums from GL_ANGLE_depth_texture + grep -v '0x' $1/GL_ANGLE_depth_texture > tmp + mv tmp $1/GL_ANGLE_depth_texture + +# Filter out GL_NONE enum from GL_ANGLE_depth_texture + grep -v 'GL_NONE' $1/GL_ANGLE_texture_usage > tmp + mv tmp $1/GL_ANGLE_texture_usage + # clean up rm -f $1/*.bak diff --git a/auto/core/gl/GL_REGAL_ES1_0_compatibility b/auto/core/gl/GL_REGAL_ES1_0_compatibility deleted file mode 100644 index f7deaf6..0000000 --- a/auto/core/gl/GL_REGAL_ES1_0_compatibility +++ /dev/null @@ -1,35 +0,0 @@ -GL_REGAL_ES1_0_compatibility -https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_ES1_0_compatibility.txt -GL_REGAL_ES1_0_compatibility - typedef int GLclampx - void glAlphaFuncx (GLenum func, GLclampx ref) - void glClearColorx (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) - void glClearDepthx (GLclampx depth) - void glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) - void glDepthRangex (GLclampx zNear, GLclampx zFar) - void glFogx (GLenum pname, GLfixed param) - void glFogxv (GLenum pname, const GLfixed* params) - void glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) - void glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) - void glLightModelx (GLenum pname, GLfixed param) - void glLightModelxv (GLenum pname, const GLfixed* params) - void glLightx (GLenum light, GLenum pname, GLfixed param) - void glLightxv (GLenum light, GLenum pname, const GLfixed* params) - void glLineWidthx (GLfixed width) - void glLoadMatrixx (const GLfixed* m) - void glMaterialx (GLenum face, GLenum pname, GLfixed param) - void glMaterialxv (GLenum face, GLenum pname, const GLfixed* params) - void glMultMatrixx (const GLfixed* m) - void glMultiTexCoord4x (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q) - void glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz) - void glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) - void glOrthox (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) - void glPointSizex (GLfixed size) - void glPolygonOffsetx (GLfixed factor, GLfixed units) - void glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z) - void glSampleCoveragex (GLclampx value, GLboolean invert) - void glScalex (GLfixed x, GLfixed y, GLfixed z) - void glTexEnvx (GLenum target, GLenum pname, GLfixed param) - void glTexEnvxv (GLenum target, GLenum pname, const GLfixed* params) - void glTexParameterx (GLenum target, GLenum pname, GLfixed param) - void glTranslatex (GLfixed x, GLfixed y, GLfixed z) diff --git a/auto/core/gl/GL_REGAL_ES1_1_compatibility b/auto/core/gl/GL_REGAL_ES1_1_compatibility deleted file mode 100644 index 53b86cc..0000000 --- a/auto/core/gl/GL_REGAL_ES1_1_compatibility +++ /dev/null @@ -1,16 +0,0 @@ -GL_REGAL_ES1_1_compatibility -https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_ES1_1_compatibility.txt -GL_REGAL_ES1_1_compatibility - void glClipPlanef (GLenum plane, const GLfloat* equation) - void glClipPlanex (GLenum plane, const GLfixed* equation) - void glGetClipPlanef (GLenum pname, GLfloat eqn[4]) - void glGetClipPlanex (GLenum pname, GLfixed eqn[4]) - void glGetFixedv (GLenum pname, GLfixed* params) - void glGetLightxv (GLenum light, GLenum pname, GLfixed* params) - void glGetMaterialxv (GLenum face, GLenum pname, GLfixed* params) - void glGetTexEnvxv (GLenum env, GLenum pname, GLfixed* params) - void glGetTexParameterxv (GLenum target, GLenum pname, GLfixed* params) - void glPointParameterx (GLenum pname, GLfixed param) - void glPointParameterxv (GLenum pname, const GLfixed* params) - void glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid* pointer) - void glTexParameterxv (GLenum target, GLenum pname, const GLfixed* params) diff --git a/auto/core/gl/GL_REGAL_enable b/auto/core/gl/GL_REGAL_enable deleted file mode 100644 index 283fb9a..0000000 --- a/auto/core/gl/GL_REGAL_enable +++ /dev/null @@ -1,8 +0,0 @@ -GL_REGAL_enable -https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_enable.txt -GL_REGAL_enable - GL_ERROR_REGAL 0x9322 - GL_DEBUG_REGAL 0x9323 - GL_LOG_REGAL 0x9324 - GL_EMULATION_REGAL 0x9325 - GL_DRIVER_REGAL 0x9326 diff --git a/auto/core/gl/GL_REGAL_error_string b/auto/core/gl/GL_REGAL_error_string deleted file mode 100644 index 8ea6409..0000000 --- a/auto/core/gl/GL_REGAL_error_string +++ /dev/null @@ -1,4 +0,0 @@ -GL_REGAL_error_string -https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_error_string.txt -GL_REGAL_error_string - const GLchar* glErrorStringREGAL (GLenum error) diff --git a/auto/core/gl/GL_REGAL_extension_query b/auto/core/gl/GL_REGAL_extension_query deleted file mode 100644 index d952651..0000000 --- a/auto/core/gl/GL_REGAL_extension_query +++ /dev/null @@ -1,5 +0,0 @@ -GL_REGAL_extension_query -https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_extension_query.txt -GL_REGAL_extension_query - GLboolean glGetExtensionREGAL (const GLchar* ext) - GLboolean glIsSupportedREGAL (const GLchar* ext) diff --git a/auto/core/gl/GL_REGAL_log b/auto/core/gl/GL_REGAL_log deleted file mode 100644 index 69ecaf2..0000000 --- a/auto/core/gl/GL_REGAL_log +++ /dev/null @@ -1,14 +0,0 @@ -GL_REGAL_log -https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_log.txt -GL_REGAL_log - GL_LOG_ERROR_REGAL 0x9319 - GL_LOG_WARNING_REGAL 0x931A - GL_LOG_INFO_REGAL 0x931B - GL_LOG_APP_REGAL 0x931C - GL_LOG_DRIVER_REGAL 0x931D - GL_LOG_INTERNAL_REGAL 0x931E - GL_LOG_DEBUG_REGAL 0x931F - GL_LOG_STATUS_REGAL 0x9320 - GL_LOG_HTTP_REGAL 0x9321 - void glLogMessageCallbackREGAL (GLLOGPROCREGAL callback) - typedef void (APIENTRY *GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, GLvoid *context) diff --git a/doc/glew.html b/doc/glew.html index 794a64c..8781673 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -127,475 +127,488 @@ width="88" height="32" border="0" alt="Support This Project"> --> 24 AMD_vertex_shader_tessellator 25 AMD_vertex_shader_viewport_index
-26 APPLE_aux_depth_stencil -27 APPLE_client_storage -28 APPLE_element_array -29 APPLE_fence -30 APPLE_float_pixels -31 APPLE_flush_buffer_range -32 APPLE_object_purgeable -33 APPLE_pixel_buffer -34 APPLE_rgb_422 -35 APPLE_row_bytes -36 APPLE_specular_vector -37 APPLE_texture_range -38 APPLE_transform_hint -39 APPLE_vertex_array_object -40 APPLE_vertex_array_range -41 APPLE_vertex_program_evaluators -42 APPLE_ycbcr_422 +26 ANGLE_depth_texture +27 ANGLE_framebuffer_blit +28 ANGLE_framebuffer_multisample +29 ANGLE_instanced_arrays +30 ANGLE_pack_reverse_row_order +31 ANGLE_program_binary +32 ANGLE_texture_compression_dxt1 +33 ANGLE_texture_compression_dxt3 +34 ANGLE_texture_compression_dxt5 +35 ANGLE_texture_usage +36 ANGLE_timer_query +37 ANGLE_translated_shader_source
-43 ARB_ES2_compatibility -44 ARB_ES3_compatibility -45 ARB_arrays_of_arrays -46 ARB_base_instance -47 ARB_blend_func_extended -48 ARB_cl_event -49 ARB_clear_buffer_object -50 ARB_color_buffer_float -51 ARB_compatibility -52 ARB_compressed_texture_pixel_storage -53 ARB_compute_shader -54 ARB_conservative_depth -55 ARB_copy_buffer -56 ARB_copy_image -57 ARB_debug_output -58 ARB_depth_buffer_float -59 ARB_depth_clamp -60 ARB_depth_texture -61 ARB_draw_buffers -62 ARB_draw_buffers_blend -63 ARB_draw_elements_base_vertex -64 ARB_draw_indirect -65 ARB_draw_instanced -66 ARB_explicit_attrib_location -67 ARB_explicit_uniform_location -68 ARB_fragment_coord_conventions -69 ARB_fragment_layer_viewport -70 ARB_fragment_program -71 ARB_fragment_program_shadow -72 ARB_fragment_shader -73 ARB_framebuffer_no_attachments -74 ARB_framebuffer_object -75 ARB_framebuffer_sRGB -76 ARB_geometry_shader4 -77 ARB_get_program_binary -78 ARB_gpu_shader5 -79 ARB_gpu_shader_fp64 -80 ARB_half_float_pixel -81 ARB_half_float_vertex -82 ARB_imaging -83 ARB_instanced_arrays -84 ARB_internalformat_query -85 ARB_internalformat_query2 -86 ARB_invalidate_subdata -87 ARB_map_buffer_alignment -88 ARB_map_buffer_range -89 ARB_matrix_palette -90 ARB_multi_draw_indirect -91 ARB_multisample -92 ARB_multitexture -93 ARB_occlusion_query -94 ARB_occlusion_query2 -95 ARB_pixel_buffer_object -96 ARB_point_parameters -97 ARB_point_sprite -98 ARB_program_interface_query -99 ARB_provoking_vertex -100 ARB_robust_buffer_access_behavior -101 ARB_robustness -102 ARB_robustness_application_isolation -103 ARB_robustness_share_group_isolation -104 ARB_sample_shading -105 ARB_sampler_objects -106 ARB_seamless_cube_map -107 ARB_separate_shader_objects -108 ARB_shader_atomic_counters -109 ARB_shader_bit_encoding -110 ARB_shader_image_load_store -111 ARB_shader_image_size -112 ARB_shader_objects -113 ARB_shader_precision -114 ARB_shader_stencil_export -115 ARB_shader_storage_buffer_object -116 ARB_shader_subroutine -117 ARB_shader_texture_lod -118 ARB_shading_language_100 -119 ARB_shading_language_420pack -120 ARB_shading_language_include -121 ARB_shading_language_packing -122 ARB_shadow -123 ARB_shadow_ambient -124 ARB_stencil_texturing -125 ARB_sync -126 ARB_tessellation_shader -127 ARB_texture_border_clamp -128 ARB_texture_buffer_object -129 ARB_texture_buffer_object_rgb32 -130 ARB_texture_buffer_range -131 ARB_texture_compression -132 ARB_texture_compression_bptc -133 ARB_texture_compression_rgtc -134 ARB_texture_cube_map -135 ARB_texture_cube_map_array -136 ARB_texture_env_add -137 ARB_texture_env_combine -138 ARB_texture_env_crossbar -139 ARB_texture_env_dot3 -140 ARB_texture_float -141 ARB_texture_gather -142 ARB_texture_mirrored_repeat -143 ARB_texture_multisample -144 ARB_texture_non_power_of_two -145 ARB_texture_query_levels -146 ARB_texture_query_lod -147 ARB_texture_rectangle -148 ARB_texture_rg -149 ARB_texture_rgb10_a2ui -150 ARB_texture_storage -151 ARB_texture_storage_multisample -152 ARB_texture_swizzle -153 ARB_texture_view -154 ARB_timer_query -155 ARB_transform_feedback2 -156 ARB_transform_feedback3 -157 ARB_transform_feedback_instanced -158 ARB_transpose_matrix -159 ARB_uniform_buffer_object -160 ARB_vertex_array_bgra -161 ARB_vertex_array_object -162 ARB_vertex_attrib_64bit -163 ARB_vertex_attrib_binding -164 ARB_vertex_blend -165 ARB_vertex_buffer_object -166 ARB_vertex_program -167 ARB_vertex_shader -168 ARB_vertex_type_2_10_10_10_rev -169 ARB_viewport_array -170 ARB_window_pos +38 APPLE_aux_depth_stencil +39 APPLE_client_storage +40 APPLE_element_array +41 APPLE_fence +42 APPLE_float_pixels +43 APPLE_flush_buffer_range +44 APPLE_object_purgeable +45 APPLE_pixel_buffer +46 APPLE_rgb_422 +47 APPLE_row_bytes +48 APPLE_specular_vector +49 APPLE_texture_range +50 APPLE_transform_hint +51 APPLE_vertex_array_object +52 APPLE_vertex_array_range +53 APPLE_vertex_program_evaluators +54 APPLE_ycbcr_422
-171 ATIX_point_sprites -172 ATIX_texture_env_combine3 -173 ATIX_texture_env_route -174 ATIX_vertex_shader_output_point_size +55 ARB_ES2_compatibility +56 ARB_ES3_compatibility +57 ARB_arrays_of_arrays +58 ARB_base_instance +59 ARB_blend_func_extended +60 ARB_cl_event +61 ARB_clear_buffer_object +62 ARB_color_buffer_float +63 ARB_compatibility +64 ARB_compressed_texture_pixel_storage +65 ARB_compute_shader +66 ARB_conservative_depth +67 ARB_copy_buffer +68 ARB_copy_image +69 ARB_debug_output +70 ARB_depth_buffer_float +71 ARB_depth_clamp +72 ARB_depth_texture +73 ARB_draw_buffers +74 ARB_draw_buffers_blend +75 ARB_draw_elements_base_vertex +76 ARB_draw_indirect +77 ARB_draw_instanced +78 ARB_explicit_attrib_location +79 ARB_explicit_uniform_location +80 ARB_fragment_coord_conventions +81 ARB_fragment_layer_viewport +82 ARB_fragment_program +83 ARB_fragment_program_shadow +84 ARB_fragment_shader +85 ARB_framebuffer_no_attachments +86 ARB_framebuffer_object +87 ARB_framebuffer_sRGB +88 ARB_geometry_shader4 +89 ARB_get_program_binary +90 ARB_gpu_shader5 +91 ARB_gpu_shader_fp64 +92 ARB_half_float_pixel +93 ARB_half_float_vertex +94 ARB_imaging +95 ARB_instanced_arrays +96 ARB_internalformat_query +97 ARB_internalformat_query2 +98 ARB_invalidate_subdata +99 ARB_map_buffer_alignment +100 ARB_map_buffer_range +101 ARB_matrix_palette +102 ARB_multi_draw_indirect +103 ARB_multisample +104 ARB_multitexture +105 ARB_occlusion_query +106 ARB_occlusion_query2 +107 ARB_pixel_buffer_object +108 ARB_point_parameters +109 ARB_point_sprite +110 ARB_program_interface_query +111 ARB_provoking_vertex +112 ARB_robust_buffer_access_behavior +113 ARB_robustness +114 ARB_robustness_application_isolation +115 ARB_robustness_share_group_isolation +116 ARB_sample_shading +117 ARB_sampler_objects +118 ARB_seamless_cube_map +119 ARB_separate_shader_objects +120 ARB_shader_atomic_counters +121 ARB_shader_bit_encoding +122 ARB_shader_image_load_store +123 ARB_shader_image_size +124 ARB_shader_objects +125 ARB_shader_precision +126 ARB_shader_stencil_export +127 ARB_shader_storage_buffer_object +128 ARB_shader_subroutine +129 ARB_shader_texture_lod +130 ARB_shading_language_100 +131 ARB_shading_language_420pack +132 ARB_shading_language_include +133 ARB_shading_language_packing +134 ARB_shadow +135 ARB_shadow_ambient +136 ARB_stencil_texturing +137 ARB_sync +138 ARB_tessellation_shader +139 ARB_texture_border_clamp +140 ARB_texture_buffer_object +141 ARB_texture_buffer_object_rgb32 +142 ARB_texture_buffer_range +143 ARB_texture_compression +144 ARB_texture_compression_bptc +145 ARB_texture_compression_rgtc +146 ARB_texture_cube_map +147 ARB_texture_cube_map_array +148 ARB_texture_env_add +149 ARB_texture_env_combine +150 ARB_texture_env_crossbar +151 ARB_texture_env_dot3 +152 ARB_texture_float +153 ARB_texture_gather +154 ARB_texture_mirrored_repeat +155 ARB_texture_multisample +156 ARB_texture_non_power_of_two +157 ARB_texture_query_levels +158 ARB_texture_query_lod +159 ARB_texture_rectangle +160 ARB_texture_rg +161 ARB_texture_rgb10_a2ui +162 ARB_texture_storage +163 ARB_texture_storage_multisample +164 ARB_texture_swizzle +165 ARB_texture_view +166 ARB_timer_query +167 ARB_transform_feedback2 +168 ARB_transform_feedback3 +169 ARB_transform_feedback_instanced +170 ARB_transpose_matrix +171 ARB_uniform_buffer_object +172 ARB_vertex_array_bgra +173 ARB_vertex_array_object +174 ARB_vertex_attrib_64bit +175 ARB_vertex_attrib_binding +176 ARB_vertex_blend +177 ARB_vertex_buffer_object +178 ARB_vertex_program +179 ARB_vertex_shader +180 ARB_vertex_type_2_10_10_10_rev +181 ARB_viewport_array +182 ARB_window_pos
-175 ATI_draw_buffers -176 ATI_element_array -177 ATI_envmap_bumpmap -178 ATI_fragment_shader -179 ATI_map_object_buffer -180 ATI_meminfo -181 ATI_pn_triangles -182 ATI_separate_stencil -183 ATI_shader_texture_lod -184 ATI_text_fragment_shader -185 ATI_texture_compression_3dc -186 ATI_texture_env_combine3 -187 ATI_texture_float -188 ATI_texture_mirror_once -189 ATI_vertex_array_object -190 ATI_vertex_attrib_array_object -191 ATI_vertex_streams +183 ATIX_point_sprites +184 ATIX_texture_env_combine3 +185 ATIX_texture_env_route +186 ATIX_vertex_shader_output_point_size
-192 EXT_422_pixels -193 EXT_Cg_shader -194 EXT_abgr -195 EXT_bgra -196 EXT_bindable_uniform -197 EXT_blend_color -198 EXT_blend_equation_separate -199 EXT_blend_func_separate -200 EXT_blend_logic_op -201 EXT_blend_minmax -202 EXT_blend_subtract -203 EXT_clip_volume_hint -204 EXT_cmyka -205 EXT_color_subtable -206 EXT_compiled_vertex_array -207 EXT_convolution -208 EXT_coordinate_frame -209 EXT_copy_texture -210 EXT_cull_vertex -211 EXT_debug_marker -212 EXT_depth_bounds_test -213 EXT_direct_state_access -214 EXT_draw_buffers2 -215 EXT_draw_instanced -216 EXT_draw_range_elements -217 EXT_fog_coord -218 EXT_fragment_lighting -219 EXT_framebuffer_blit -220 EXT_framebuffer_multisample -221 EXT_framebuffer_multisample_blit_scaled -222 EXT_framebuffer_object -223 EXT_framebuffer_sRGB -224 EXT_geometry_shader4 -225 EXT_gpu_program_parameters -226 EXT_gpu_shader4 -227 EXT_histogram -228 EXT_index_array_formats -229 EXT_index_func -230 EXT_index_material -231 EXT_index_texture -232 EXT_light_texture -233 EXT_misc_attribute -234 EXT_multi_draw_arrays -235 EXT_multisample -236 EXT_packed_depth_stencil -237 EXT_packed_float -238 EXT_packed_pixels -239 EXT_paletted_texture -240 EXT_pixel_buffer_object -241 EXT_pixel_transform -242 EXT_pixel_transform_color_table -243 EXT_point_parameters -244 EXT_polygon_offset -245 EXT_provoking_vertex -246 EXT_rescale_normal -247 EXT_scene_marker -248 EXT_secondary_color -249 EXT_separate_shader_objects -250 EXT_separate_specular_color -251 EXT_shader_image_load_store -252 EXT_shadow_funcs -253 EXT_shared_texture_palette -254 EXT_stencil_clear_tag -255 EXT_stencil_two_side -256 EXT_stencil_wrap -257 EXT_subtexture -258 EXT_texture -259 EXT_texture3D -260 EXT_texture_array -261 EXT_texture_buffer_object -262 EXT_texture_compression_dxt1 -263 EXT_texture_compression_latc -264 EXT_texture_compression_rgtc -265 EXT_texture_compression_s3tc -266 EXT_texture_cube_map -267 EXT_texture_edge_clamp -268 EXT_texture_env -269 EXT_texture_env_add -270 EXT_texture_env_combine -271 EXT_texture_env_dot3 -272 EXT_texture_filter_anisotropic -273 EXT_texture_integer -274 EXT_texture_lod_bias -275 EXT_texture_mirror_clamp -276 EXT_texture_object -277 EXT_texture_perturb_normal -278 EXT_texture_rectangle -279 EXT_texture_sRGB -280 EXT_texture_sRGB_decode -281 EXT_texture_shared_exponent -282 EXT_texture_snorm -283 EXT_texture_swizzle -284 EXT_timer_query -285 EXT_transform_feedback -286 EXT_vertex_array -287 EXT_vertex_array_bgra -288 EXT_vertex_attrib_64bit -289 EXT_vertex_shader -290 EXT_vertex_weighting -291 EXT_x11_sync_object +187 ATI_draw_buffers +188 ATI_element_array +189 ATI_envmap_bumpmap +190 ATI_fragment_shader +191 ATI_map_object_buffer +192 ATI_meminfo +193 ATI_pn_triangles +194 ATI_separate_stencil +195 ATI_shader_texture_lod +196 ATI_text_fragment_shader +197 ATI_texture_compression_3dc +198 ATI_texture_env_combine3 +199 ATI_texture_float +200 ATI_texture_mirror_once +201 ATI_vertex_array_object +202 ATI_vertex_attrib_array_object +203 ATI_vertex_streams
-292 GREMEDY_frame_terminator -293 GREMEDY_string_marker +204 EXT_422_pixels +205 EXT_Cg_shader +206 EXT_abgr +207 EXT_bgra +208 EXT_bindable_uniform +209 EXT_blend_color +210 EXT_blend_equation_separate +211 EXT_blend_func_separate +212 EXT_blend_logic_op +213 EXT_blend_minmax +214 EXT_blend_subtract +215 EXT_clip_volume_hint +216 EXT_cmyka +217 EXT_color_subtable +218 EXT_compiled_vertex_array +219 EXT_convolution +220 EXT_coordinate_frame +221 EXT_copy_texture +222 EXT_cull_vertex +223 EXT_debug_marker +224 EXT_depth_bounds_test +225 EXT_direct_state_access +226 EXT_draw_buffers2 +227 EXT_draw_instanced +228 EXT_draw_range_elements +229 EXT_fog_coord +230 EXT_fragment_lighting +231 EXT_framebuffer_blit +232 EXT_framebuffer_multisample +233 EXT_framebuffer_multisample_blit_scaled +234 EXT_framebuffer_object +235 EXT_framebuffer_sRGB +236 EXT_geometry_shader4 +237 EXT_gpu_program_parameters +238 EXT_gpu_shader4 +239 EXT_histogram +240 EXT_index_array_formats +241 EXT_index_func +242 EXT_index_material +243 EXT_index_texture +244 EXT_light_texture +245 EXT_misc_attribute +246 EXT_multi_draw_arrays +247 EXT_multisample +248 EXT_packed_depth_stencil +249 EXT_packed_float +250 EXT_packed_pixels +251 EXT_paletted_texture +252 EXT_pixel_buffer_object +253 EXT_pixel_transform +254 EXT_pixel_transform_color_table +255 EXT_point_parameters +256 EXT_polygon_offset +257 EXT_provoking_vertex +258 EXT_rescale_normal +259 EXT_scene_marker +260 EXT_secondary_color +261 EXT_separate_shader_objects +262 EXT_separate_specular_color +263 EXT_shader_image_load_store +264 EXT_shadow_funcs +265 EXT_shared_texture_palette +266 EXT_stencil_clear_tag +267 EXT_stencil_two_side +268 EXT_stencil_wrap +269 EXT_subtexture +270 EXT_texture +271 EXT_texture3D +272 EXT_texture_array +273 EXT_texture_buffer_object +274 EXT_texture_compression_dxt1 +275 EXT_texture_compression_latc +276 EXT_texture_compression_rgtc +277 EXT_texture_compression_s3tc +278 EXT_texture_cube_map +279 EXT_texture_edge_clamp +280 EXT_texture_env +281 EXT_texture_env_add +282 EXT_texture_env_combine +283 EXT_texture_env_dot3 +284 EXT_texture_filter_anisotropic +285 EXT_texture_integer +286 EXT_texture_lod_bias +287 EXT_texture_mirror_clamp +288 EXT_texture_object +289 EXT_texture_perturb_normal +290 EXT_texture_rectangle +291 EXT_texture_sRGB +292 EXT_texture_sRGB_decode +293 EXT_texture_shared_exponent +294 EXT_texture_snorm +295 EXT_texture_swizzle +296 EXT_timer_query +297 EXT_transform_feedback +298 EXT_vertex_array +299 EXT_vertex_array_bgra +300 EXT_vertex_attrib_64bit +301 EXT_vertex_shader +302 EXT_vertex_weighting +303 EXT_x11_sync_object
-294 HP_convolution_border_modes -295 HP_image_transform -296 HP_occlusion_test -297 HP_texture_lighting +304 GREMEDY_frame_terminator +305 GREMEDY_string_marker
-298 IBM_cull_vertex -299 IBM_multimode_draw_arrays -300 IBM_rasterpos_clip -301 IBM_static_data -302 IBM_texture_mirrored_repeat -303 IBM_vertex_array_lists +306 HP_convolution_border_modes +307 HP_image_transform +308 HP_occlusion_test +309 HP_texture_lighting
-304 INGR_color_clamp -305 INGR_interlace_read +310 IBM_cull_vertex +311 IBM_multimode_draw_arrays +312 IBM_rasterpos_clip +313 IBM_static_data +314 IBM_texture_mirrored_repeat +315 IBM_vertex_array_lists
-306 INTEL_map_texture -307 INTEL_parallel_arrays -308 INTEL_texture_scissor +316 INGR_color_clamp +317 INGR_interlace_read
-309 KHR_debug -310 KHR_texture_compression_astc_ldr +318 INTEL_map_texture +319 INTEL_parallel_arrays +320 INTEL_texture_scissor
-311 KTX_buffer_region +321 KHR_debug +322 KHR_texture_compression_astc_ldr
-312 MESAX_texture_stack +323 KTX_buffer_region
-313 MESA_pack_invert -314 MESA_resize_buffers -315 MESA_window_pos -316 MESA_ycbcr_texture +324 MESAX_texture_stack
-317 NVX_conditional_render -318 NVX_gpu_memory_info +325 MESA_pack_invert +326 MESA_resize_buffers +327 MESA_window_pos +328 MESA_ycbcr_texture
-319 NV_bindless_texture -320 NV_blend_square -321 NV_compute_program5 -322 NV_conditional_render -323 NV_copy_depth_to_color -324 NV_copy_image -325 NV_deep_texture3D -326 NV_depth_buffer_float -327 NV_depth_clamp -328 NV_depth_range_unclamped -329 NV_draw_texture -330 NV_evaluators -331 NV_explicit_multisample -332 NV_fence -333 NV_float_buffer -334 NV_fog_distance -335 NV_fragment_program -336 NV_fragment_program2 -337 NV_fragment_program4 -338 NV_fragment_program_option -339 NV_framebuffer_multisample_coverage -340 NV_geometry_program4 -341 NV_geometry_shader4 -342 NV_gpu_program4 -343 NV_gpu_program5 -344 NV_gpu_program_fp64 -345 NV_gpu_shader5 -346 NV_half_float -347 NV_light_max_exponent -348 NV_multisample_coverage -349 NV_multisample_filter_hint -350 NV_occlusion_query -351 NV_packed_depth_stencil -352 NV_parameter_buffer_object -353 NV_parameter_buffer_object2 -354 NV_path_rendering -355 NV_pixel_data_range -356 NV_point_sprite -357 NV_present_video -358 NV_primitive_restart -359 NV_register_combiners -360 NV_register_combiners2 -361 NV_shader_atomic_counters -362 NV_shader_atomic_float -363 NV_shader_buffer_load -364 NV_shader_storage_buffer_object -365 NV_tessellation_program5 -366 NV_texgen_emboss -367 NV_texgen_reflection -368 NV_texture_barrier -369 NV_texture_compression_vtc -370 NV_texture_env_combine4 -371 NV_texture_expand_normal -372 NV_texture_multisample -373 NV_texture_rectangle -374 NV_texture_shader -375 NV_texture_shader2 -376 NV_texture_shader3 -377 NV_transform_feedback -378 NV_transform_feedback2 -379 NV_vdpau_interop -380 NV_vertex_array_range -381 NV_vertex_array_range2 -382 NV_vertex_attrib_integer_64bit -383 NV_vertex_buffer_unified_memory -384 NV_vertex_program -385 NV_vertex_program1_1 -386 NV_vertex_program2 -387 NV_vertex_program2_option -388 NV_vertex_program3 -389 NV_vertex_program4 -390 NV_video_capture +329 NVX_conditional_render +330 NVX_gpu_memory_info
-391 OES_byte_coordinates -392 OES_compressed_paletted_texture -393 OES_read_format -394 OES_single_precision +331 NV_bindless_texture +332 NV_blend_square +333 NV_compute_program5 +334 NV_conditional_render +335 NV_copy_depth_to_color +336 NV_copy_image +337 NV_deep_texture3D +338 NV_depth_buffer_float +339 NV_depth_clamp +340 NV_depth_range_unclamped +341 NV_draw_texture +342 NV_evaluators +343 NV_explicit_multisample +344 NV_fence +345 NV_float_buffer +346 NV_fog_distance +347 NV_fragment_program +348 NV_fragment_program2 +349 NV_fragment_program4 +350 NV_fragment_program_option +351 NV_framebuffer_multisample_coverage +352 NV_geometry_program4 +353 NV_geometry_shader4 +354 NV_gpu_program4 +355 NV_gpu_program5 +356 NV_gpu_program_fp64 +357 NV_gpu_shader5 +358 NV_half_float +359 NV_light_max_exponent +360 NV_multisample_coverage +361 NV_multisample_filter_hint +362 NV_occlusion_query +363 NV_packed_depth_stencil +364 NV_parameter_buffer_object +365 NV_parameter_buffer_object2 +366 NV_path_rendering +367 NV_pixel_data_range +368 NV_point_sprite +369 NV_present_video +370 NV_primitive_restart +371 NV_register_combiners +372 NV_register_combiners2 +373 NV_shader_atomic_counters +374 NV_shader_atomic_float +375 NV_shader_buffer_load +376 NV_shader_storage_buffer_object +377 NV_tessellation_program5 +378 NV_texgen_emboss +379 NV_texgen_reflection +380 NV_texture_barrier +381 NV_texture_compression_vtc +382 NV_texture_env_combine4 +383 NV_texture_expand_normal +384 NV_texture_multisample +385 NV_texture_rectangle +386 NV_texture_shader +387 NV_texture_shader2 +388 NV_texture_shader3 +389 NV_transform_feedback +390 NV_transform_feedback2 +391 NV_vdpau_interop +392 NV_vertex_array_range +393 NV_vertex_array_range2 +394 NV_vertex_attrib_integer_64bit +395 NV_vertex_buffer_unified_memory +396 NV_vertex_program +397 NV_vertex_program1_1 +398 NV_vertex_program2 +399 NV_vertex_program2_option +400 NV_vertex_program3 +401 NV_vertex_program4 +402 NV_video_capture
-395 OML_interlace -396 OML_resample -397 OML_subsample +403 OES_byte_coordinates +404 OES_compressed_paletted_texture +405 OES_read_format +406 OES_single_precision
-398 PGI_misc_hints -399 PGI_vertex_hints +407 OML_interlace +408 OML_resample +409 OML_subsample
-400 REGAL_ES1_0_compatibility -401 REGAL_ES1_1_compatibility -402 REGAL_enable -403 REGAL_error_string -404 REGAL_extension_query -405 REGAL_log +410 PGI_misc_hints +411 PGI_vertex_hints
-406 REND_screen_coordinates +412 REGAL_ES1_0_compatibility +413 REGAL_ES1_1_compatibility +414 REGAL_enable +415 REGAL_error_string +416 REGAL_extension_query +417 REGAL_log
-407 S3_s3tc +418 REND_screen_coordinates
-408 SGIS_color_range -409 SGIS_detail_texture -410 SGIS_fog_function -411 SGIS_generate_mipmap -412 SGIS_multisample -413 SGIS_pixel_texture -414 SGIS_point_line_texgen -415 SGIS_sharpen_texture -416 SGIS_texture4D -417 SGIS_texture_border_clamp -418 SGIS_texture_edge_clamp -419 SGIS_texture_filter4 -420 SGIS_texture_lod -421 SGIS_texture_select +419 S3_s3tc
-422 SGIX_async -423 SGIX_async_histogram -424 SGIX_async_pixel -425 SGIX_blend_alpha_minmax -426 SGIX_clipmap -427 SGIX_convolution_accuracy -428 SGIX_depth_texture -429 SGIX_flush_raster -430 SGIX_fog_offset -431 SGIX_fog_texture -432 SGIX_fragment_specular_lighting -433 SGIX_framezoom -434 SGIX_interlace -435 SGIX_ir_instrument1 -436 SGIX_list_priority -437 SGIX_pixel_texture -438 SGIX_pixel_texture_bits -439 SGIX_reference_plane -440 SGIX_resample -441 SGIX_shadow -442 SGIX_shadow_ambient -443 SGIX_sprite -444 SGIX_tag_sample_buffer -445 SGIX_texture_add_env -446 SGIX_texture_coordinate_clamp -447 SGIX_texture_lod_bias -448 SGIX_texture_multi_buffer -449 SGIX_texture_range -450 SGIX_texture_scale_bias -451 SGIX_vertex_preclip -452 SGIX_vertex_preclip_hint -453 SGIX_ycrcb +420 SGIS_color_range +421 SGIS_detail_texture +422 SGIS_fog_function +423 SGIS_generate_mipmap +424 SGIS_multisample +425 SGIS_pixel_texture +426 SGIS_point_line_texgen +427 SGIS_sharpen_texture +428 SGIS_texture4D +429 SGIS_texture_border_clamp +430 SGIS_texture_edge_clamp +431 SGIS_texture_filter4 +432 SGIS_texture_lod +433 SGIS_texture_select
-454 SGI_color_matrix -455 SGI_color_table -456 SGI_texture_color_table +434 SGIX_async +435 SGIX_async_histogram +436 SGIX_async_pixel +437 SGIX_blend_alpha_minmax +438 SGIX_clipmap +439 SGIX_convolution_accuracy +440 SGIX_depth_texture +441 SGIX_flush_raster +442 SGIX_fog_offset +443 SGIX_fog_texture +444 SGIX_fragment_specular_lighting +445 SGIX_framezoom +446 SGIX_interlace +447 SGIX_ir_instrument1 +448 SGIX_list_priority +449 SGIX_pixel_texture +450 SGIX_pixel_texture_bits +451 SGIX_reference_plane +452 SGIX_resample +453 SGIX_shadow +454 SGIX_shadow_ambient +455 SGIX_sprite +456 SGIX_tag_sample_buffer +457 SGIX_texture_add_env +458 SGIX_texture_coordinate_clamp +459 SGIX_texture_lod_bias +460 SGIX_texture_multi_buffer +461 SGIX_texture_range +462 SGIX_texture_scale_bias +463 SGIX_vertex_preclip +464 SGIX_vertex_preclip_hint +465 SGIX_ycrcb
-457 SUNX_constant_data +466 SGI_color_matrix +467 SGI_color_table +468 SGI_texture_color_table
-458 SUN_convolution_border_modes -459 SUN_global_alpha -460 SUN_mesh_array -461 SUN_read_video_pixels -462 SUN_slice_accum -463 SUN_triangle_list -464 SUN_vertex +469 SUNX_constant_data
-465 WIN_phong_shading -466 WIN_specular_fog -467 WIN_swap_hint +470 SUN_convolution_border_modes +471 SUN_global_alpha +472 SUN_mesh_array +473 SUN_read_video_pixels +474 SUN_slice_accum +475 SUN_triangle_list +476 SUN_vertex +
+477 WIN_phong_shading +478 WIN_specular_fog +479 WIN_swap_hint From 18ae6909fe49598ce25529b08a9986ca3a981fb7 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 16 Jul 2013 11:00:52 -0500 Subject: [PATCH 02/10] Fixup URLs for ANGLE and REGAL extensions. --- auto/bin/filter_gl_ext.sh | 5 +++++ doc/glew.html | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index 7b2350e..ee823e1 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -463,5 +463,10 @@ EOT grep -v 'GL_NONE' $1/GL_ANGLE_texture_usage > tmp mv tmp $1/GL_ANGLE_texture_usage +# Fixup REGAL and ANGLE urls + + for i in $1/GL_REGAL_*; do perl -e 's#http://www.opengl.org/registry/specs/gl/REGAL/.*#https://github.com/p3/regal/tree/master/doc/extensions#g' -pi $i; done + for i in $1/GL_ANGLE_*; do perl -e 's#http://www.opengl.org/registry/specs/gl/ANGLE/.*#https://code.google.com/p/angleproject/source/browse/\#git%2Fextensions#g' -pi $i; done + # clean up rm -f $1/*.bak diff --git a/doc/glew.html b/doc/glew.html index 8781673..012af86 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -127,18 +127,18 @@ width="88" height="32" border="0" alt="Support This Project"> --> 24 AMD_vertex_shader_tessellator 25 AMD_vertex_shader_viewport_index
-26 ANGLE_depth_texture -27 ANGLE_framebuffer_blit -28 ANGLE_framebuffer_multisample -29 ANGLE_instanced_arrays -30 ANGLE_pack_reverse_row_order -31 ANGLE_program_binary -32 ANGLE_texture_compression_dxt1 -33 ANGLE_texture_compression_dxt3 -34 ANGLE_texture_compression_dxt5 -35 ANGLE_texture_usage -36 ANGLE_timer_query -37 ANGLE_translated_shader_source +26 ANGLE_depth_texture +27 ANGLE_framebuffer_blit +28 ANGLE_framebuffer_multisample +29 ANGLE_instanced_arrays +30 ANGLE_pack_reverse_row_order +31 ANGLE_program_binary +32 ANGLE_texture_compression_dxt1 +33 ANGLE_texture_compression_dxt3 +34 ANGLE_texture_compression_dxt5 +35 ANGLE_texture_usage +36 ANGLE_timer_query +37 ANGLE_translated_shader_source
38 APPLE_aux_depth_stencil 39 APPLE_client_storage @@ -533,12 +533,12 @@ width="88" height="32" border="0" alt="Support This Project"> --> 410 PGI_misc_hints 411 PGI_vertex_hints
-412 REGAL_ES1_0_compatibility -413 REGAL_ES1_1_compatibility -414 REGAL_enable -415 REGAL_error_string -416 REGAL_extension_query -417 REGAL_log +412 REGAL_ES1_0_compatibility +413 REGAL_ES1_1_compatibility +414 REGAL_enable +415 REGAL_error_string +416 REGAL_extension_query +417 REGAL_log
418 REND_screen_coordinates
From e0242aa735ea550e9b224345c64a9fe1437b1cb5 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 20 Jul 2013 22:04:33 -0500 Subject: [PATCH 03/10] Revamp VC10 projects based on patch from Matias Ghioldi https://sourceforge.net/p/glew/patches/37/ --- build/vc10/common.props | 29 +++ build/vc10/glew.sln | 42 ++++- build/vc10/glew_shared.vcxproj | 319 ++++++++++++++++++++++++++++----- build/vc10/glew_static.vcxproj | 271 +++++++++++++++++++++++----- build/vc10/glewinfo.vcxproj | 317 ++++++++++++++++++++++++++------ build/vc10/visualinfo.vcxproj | 314 +++++++++++++++++++++++++++----- 6 files changed, 1093 insertions(+), 199 deletions(-) create mode 100644 build/vc10/common.props diff --git a/build/vc10/common.props b/build/vc10/common.props new file mode 100644 index 0000000..83ef102 --- /dev/null +++ b/build/vc10/common.props @@ -0,0 +1,29 @@ + + + + + ../../include + ../../lib + ../../bin + + + + + $(INCLUDE_DIR) + + + + + $(INCLUDE_DIR) + true + + + $(LIB_DIR) + true + + + $(BIN_DIR) + true + + + \ No newline at end of file diff --git a/build/vc10/glew.sln b/build/vc10/glew.sln index b2060bc..164436f 100755 --- a/build/vc10/glew.sln +++ b/build/vc10/glew.sln @@ -6,55 +6,85 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "glew_static.vcxproj", "{664E6F0D-6784-4760-9565-D54F8EB1EDF4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glewinfo", "glewinfo.vcxproj", "{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}" - ProjectSection(ProjectDependencies) = postProject - {664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {664E6F0D-6784-4760-9565-D54F8EB1EDF4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vcxproj", "{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}" - ProjectSection(ProjectDependencies) = postProject - {664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {664E6F0D-6784-4760-9565-D54F8EB1EDF4} - EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug MX|Win32 = Debug MX|Win32 + Debug MX|x64 = Debug MX|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release MX|Win32 = Release MX|Win32 + Release MX|x64 = Release MX|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.Build.0 = Debug MX|Win32 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.ActiveCfg = Debug MX|x64 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.Build.0 = Debug MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.ActiveCfg = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.Build.0 = Debug|Win32 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.ActiveCfg = Debug|x64 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.Build.0 = Debug|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.ActiveCfg = Release MX|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.Build.0 = Release MX|Win32 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.ActiveCfg = Release MX|x64 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.Build.0 = Release MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.ActiveCfg = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.Build.0 = Release|Win32 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.ActiveCfg = Release|x64 + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.Build.0 = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.Build.0 = Debug MX|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.ActiveCfg = Debug MX|x64 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.Build.0 = Debug MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.ActiveCfg = Release MX|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.Build.0 = Release MX|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.ActiveCfg = Release MX|x64 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.Build.0 = Release MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.Build.0 = Debug MX|Win32 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.ActiveCfg = Debug MX|x64 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.Build.0 = Debug MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.ActiveCfg = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.Build.0 = Debug|Win32 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.ActiveCfg = Debug|x64 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.Build.0 = Debug|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.ActiveCfg = Release MX|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.Build.0 = Release MX|Win32 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.ActiveCfg = Release MX|x64 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.Build.0 = Release MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.ActiveCfg = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.Build.0 = Release|Win32 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.ActiveCfg = Release|x64 + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.Build.0 = Release|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.Build.0 = Debug MX|Win32 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.ActiveCfg = Debug MX|x64 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.Build.0 = Debug MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.ActiveCfg = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.Build.0 = Debug|Win32 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.ActiveCfg = Debug|x64 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.Build.0 = Debug|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.ActiveCfg = Release MX|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.Build.0 = Release MX|Win32 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.ActiveCfg = Release MX|x64 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.Build.0 = Release MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.ActiveCfg = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.Build.0 = Release|Win32 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|x64.ActiveCfg = Release|x64 + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/vc10/glew_shared.vcxproj b/build/vc10/glew_shared.vcxproj index 3a2a97a..f730fb1 100755 --- a/build/vc10/glew_shared.vcxproj +++ b/build/vc10/glew_shared.vcxproj @@ -5,81 +5,146 @@ Debug MX Win32 + + Debug MX + x64 + Debug Win32 + + Debug + x64 + Release MX Win32 + + Release MX + x64 + Release Win32 + + Release + x64 + + {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D} DynamicLibrary false + + DynamicLibrary + false + DynamicLibrary false + + DynamicLibrary + false + DynamicLibrary false + + DynamicLibrary + false + DynamicLibrary false + + DynamicLibrary + false + - - + + + + - - + + + + - - + + + + - - + + + + - ../../bin/ - shared/release_mx/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ + false + glew32mx + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ false glew32mx - ../../bin/ - shared/release/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ + false + glew32 + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ false glew32 - ../../bin/ - shared/debug_mx/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ + false + glew32mxd + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ false glew32mxd - ../../bin/ - shared/debug/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ + false + glew32d + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + shared/$(Configuration)/$(PlatformName)/ false glew32d @@ -92,12 +157,9 @@ MaxSpeed true Level3 - ../../include;%(AdditionalIncludeDirectories) + $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/release-mx\ - .\shared/release-mx\glew_shared.pch - .\shared/release-mx\ - .\shared/release-mx\ + .\shared/$(Configuration)\glew_shared.pch true @@ -112,17 +174,59 @@ true - .\../../lib\glew_shared.bsc + $(TargetDir)glew_shared.bsc true true Console - ../../bin/glew32mx.dll - .\../../lib\glew32mx.lib + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) /ignore:4089 + + + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + $(INCLUDE_DIR) + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) + .\shared/$(Configuration)\glew_shared.pch + + + true + NDEBUG;%(PreprocessorDefinitions) + .\../../lib\glew_shared.tlb + true + + + 0x0409 + NDEBUG;GLEW_MX;%(PreprocessorDefinitions) + + + true + $(TargetDir)glew_shared.bsc + + + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + 0x62AA0000 + opengl32.lib;%(AdditionalDependencies) + /ignore:4089 + + @@ -134,12 +238,9 @@ MaxSpeed true Level3 - ../../include;%(AdditionalIncludeDirectories) + $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/release\ - .\shared/release\glew_shared.pch - .\shared/release\ - .\shared/release\ + .\shared/$(Configuration)\glew_shared.pch true @@ -154,17 +255,59 @@ true - .\../../lib\glew_shared.bsc + $(TargetDir)glew_shared.bsc true true Console - ../../bin/glew32.dll - .\../../lib\glew32.lib + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) /ignore:4089 + + + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + $(INCLUDE_DIR) + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + .\shared/$(Configuration)\glew_shared.pch + + + true + NDEBUG;%(PreprocessorDefinitions) + .\../../lib\glew_shared.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + $(TargetDir)glew_shared.bsc + + + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + 0x62AA0000 + opengl32.lib;%(AdditionalDependencies) + /ignore:4089 + + @@ -175,12 +318,9 @@ Disabled true Level3 - ../../include;%(AdditionalIncludeDirectories) + $(INCLUDE_DIR) WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/debug-mx\ - .\shared/debug-mx\glew_shared.pch - .\shared/debug-mx\ - .\shared/debug-mx\ + .\shared/$(Configuration)\glew_shared.pch EnableFastChecks @@ -196,17 +336,59 @@ true - .\../../lib\glew_shared.bsc + $(TargetDir)glew_shared.bsc true true true Console - ../../bin/glew32mxd.dll - .\../../lib\glew32mxd.lib + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) + + + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + $(INCLUDE_DIR) + WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) + .\shared/$(Configuration)\glew_shared.pch + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\../../lib\glew_shared.tlb + true + + + 0x0409 + _DEBUG;GLEW_MX;%(PreprocessorDefinitions) + + + true + $(TargetDir)glew_shared.bsc + + + true + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + 0x62AA0000 + opengl32.lib;%(AdditionalDependencies) + + @@ -216,14 +398,11 @@ false Disabled true - Level3 - ../../include;%(AdditionalIncludeDirectories) WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/debug\ - .\shared/debug\glew_shared.pch - .\shared/debug\ - .\shared/debug\ + .\shared/$(Configuration)\glew_shared.pch EnableFastChecks + Level3 + $(INCLUDE_DIR) true @@ -238,17 +417,59 @@ true - .\../../lib\glew_shared.bsc + $(TargetDir)glew_shared.bsc true true true Console - ../../bin/glew32d.dll - .\../../lib\glew32d.lib + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) + + + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + WIN32;WIN32_LEAN_AND_MEAN;GLEW_BUILD;%(PreprocessorDefinitions) + .\shared/$(Configuration)\glew_shared.pch + EnableFastChecks + Level3 + $(INCLUDE_DIR) + + + true + _DEBUG;%(PreprocessorDefinitions) + .\../../lib\glew_shared.tlb + true + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + $(TargetDir)glew_shared.bsc + + + true + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + 0x62AA0000 + opengl32.lib;%(AdditionalDependencies) + + diff --git a/build/vc10/glew_static.vcxproj b/build/vc10/glew_static.vcxproj index 4af7cbe..b97246d 100755 --- a/build/vc10/glew_static.vcxproj +++ b/build/vc10/glew_static.vcxproj @@ -5,96 +5,176 @@ Debug MX Win32 + + Debug MX + x64 + Debug Win32 + + Debug + x64 + Release MX Win32 + + Release MX + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + + {664E6F0D-6784-4760-9565-D54F8EB1EDF4} Application + + Application + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - ../../lib/ - static/debug_mx/ + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + glew32mxsd + + + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ glew32mxsd - ../../lib/ - static/debug/ + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + glew32s + + + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ glew32s - ../../lib/ - static/release_mx/ + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + glew32mxs + + + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ glew32mxs - ../../lib/ - static/debug/ + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + glew32sd + + + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ glew32sd - ../../lib/ + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + + + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ @@ -105,12 +185,9 @@ true Level3 ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/debug-mx\ - .\static/debug-mx\glew_static.pch - .\static/debug-mx\ - .\static/debug-mx\ + WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + .\static/$(Configuration)glew_static.pch 0x0409 @@ -122,10 +199,37 @@ true - ../../lib/glew32mxsd.lib + $(OutDir)$(TargetName)$(TargetExt) MachineX86 + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + .\static/$(Configuration)glew_static.pch + + + 0x0409 + _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) + + + true + .\../../lib\glew_static.bsc + + + true + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + MultiThreaded @@ -136,11 +240,8 @@ true Level3 ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/release\ - .\static/release\glew_static.pch - .\static/release\ - .\static/release\ + WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + .\static/$(Configuration)glew_static.pch 0x0409 @@ -152,10 +253,37 @@ true - ../../lib/glew32s.lib + $(OutDir)$(TargetName)$(TargetExt) MachineX86 + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + .\static/$(Configuration)glew_static.pch + + + 0x0409 + NDEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + + + true + .\../../lib\glew_static.bsc + + + true + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + MultiThreaded @@ -166,11 +294,8 @@ true Level3 ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/release-mx\ - .\static/release-mx\glew_static.pch - .\static/release-mx\ - .\static/release-mx\ + WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) + .\static/$(Configuration)glew_static.pch 0x0409 @@ -182,10 +307,37 @@ true - ../../lib/glew32mxs.lib + $(OutDir)$(TargetName)$(TargetExt) MachineX86 + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) + .\static/$(Configuration)glew_static.pch + + + 0x0409 + NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) + + + true + .\../../lib\glew_static.bsc + + + true + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + MultiThreadedDebugDLL @@ -194,13 +346,9 @@ Disabled true Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/debug\ - .\static/debug\glew_static.pch - .\static/debug\ - .\static/debug\ + WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + .\static/$(Configuration)glew_static.pch 0x0409 @@ -208,17 +356,50 @@ true - .\../../lib\glew_static.bsc + $(TargetDir)glew_static.bsc true - ../../lib/glew32sd.lib + $(OutDir)$(TargetName)$(TargetExt) MachineX86 + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + .\static/$(Configuration)glew_static.pch + + + 0x0409 + _DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + + + true + $(TargetDir)glew_static.bsc + + + true + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + ../../include;%(AdditionalIncludeDirectories) + .\static/$(Configuration)glew_static.pch + + + + + ../../include;%(AdditionalIncludeDirectories) + .\static/$(Configuration)glew_static.pch @@ -234,4 +415,4 @@ - \ No newline at end of file + diff --git a/build/vc10/glewinfo.vcxproj b/build/vc10/glewinfo.vcxproj index 00aeaa4..127fc7b 100755 --- a/build/vc10/glewinfo.vcxproj +++ b/build/vc10/glewinfo.vcxproj @@ -5,97 +5,178 @@ Debug MX Win32 + + Debug MX + x64 + Debug Win32 + + Debug + x64 + Release MX Win32 + + Release MX + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + + {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA} Application + + Application + Application false + + Application + false + Application false + + Application + false + Application false + + Application + false + Application false + + Application + false + - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - ../../bin/ - static/release_mx/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + glewinfo-mx + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false glewinfo-mx - ../../bin/ - static/debug_mx/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + glewinfo-mxd + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false glewinfo-mxd - ../../bin/ - static/debug/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + glewinfod + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false glewinfod - ../../bin/ - static/release/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + glewinfo + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false glewinfo - ../../bin/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ glewinfo + static/$(Configuration)/$(PlatformName)/ + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + glewinfo + static/$(Configuration)/$(PlatformName)/ @@ -106,12 +187,8 @@ MaxSpeed true Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/release-mx\ - .\static/release-mx\glewinfo.pch - .\static/release-mx\ - .\static/release-mx\ + WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)glewinfo.pch .\../../bin\glewinfo.tlb @@ -127,8 +204,40 @@ true Console - ../../bin/glewinfo-mx.exe - ../../lib/glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)glewinfo.pch + + + .\../../bin\glewinfo.tlb + + + 0x0409 + NDEBUG;GLEW_MX;%(PreprocessorDefinitions) + + + true + .\../../bin\glewinfo.bsc + + + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ @@ -139,12 +248,8 @@ Disabled true Level3 - ../../include;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/debug-mx\ - .\static/debug-mx\glewinfo.pch - .\static/debug-mx\ - .\static/debug-mx\ + .\static/$(Configuration)glewinfo.pch EnableFastChecks @@ -162,8 +267,41 @@ true true Console - ../../bin/glewinfo-mxd.exe - ../../lib/glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)glewinfo.pch + EnableFastChecks + + + .\../../bin\glewinfo.tlb + + + 0x0409 + _DEBUG;GLEW_MX;%(PreprocessorDefinitions) + + + true + .\../../bin\glewinfo.bsc + + + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ @@ -174,12 +312,8 @@ Disabled true Level3 - ../../include;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/debug\ - .\static/debug\glewinfo.pch - .\static/debug\ - .\static/debug\ + .\static/$(Configuration)glewinfo.pch EnableFastChecks @@ -191,14 +325,47 @@ true - .\../../bin\glewinfo.bsc + $(TargetDir)glewinfo.bsc true true Console - ../../bin/glewinfod.exe - ../../lib/glew32sd.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32sd.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)glewinfo.pch + EnableFastChecks + + + .\../../bin\glewinfo.tlb + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + $(TargetDir)glewinfo.bsc + + + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32sd.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ @@ -210,12 +377,8 @@ MaxSpeed true Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/release\ - .\static/release\glewinfo.pch - .\static/release\ - .\static/release\ + WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)glewinfo.pch .\../../bin\glewinfo.tlb @@ -231,15 +394,69 @@ true Console - .\../../bin\glewinfo.exe - ../../lib/glew32s.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32s.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)glewinfo.pch + + + .\../../bin\glewinfo.tlb + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\../../bin\glewinfo.bsc + + + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32s.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + .\static/$(Configuration)glewinfo.pch + + + + + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + .\static/$(Configuration)glewinfo.pch + + - + + {664e6f0d-6784-4760-9565-d54f8eb1edf4} + diff --git a/build/vc10/visualinfo.vcxproj b/build/vc10/visualinfo.vcxproj index 7d76eef..4cf4b8b 100755 --- a/build/vc10/visualinfo.vcxproj +++ b/build/vc10/visualinfo.vcxproj @@ -5,95 +5,175 @@ Debug MX Win32 + + Debug MX + x64 + Debug Win32 + + Debug + x64 + Release MX Win32 + + Release MX + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + + {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E} Application + + Application + Application false + + Application + false + Application false + + Application + false + Application false + + Application + false + Application false + + Application + false + - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - ../../bin/ - static/debug_mx/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + visualinfo-mxd + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false visualinfo-mxd - ../../bin/ - static/debug/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + visualinfod + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false visualinfod - ../../bin/ - static/release_mx/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + visualinfo-mx + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false visualinfo-mx - ../../bin/ - static/release/ + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ + false + visualinfo + + + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + static/$(Configuration)/$(PlatformName)/ false visualinfo + $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + visualinfo + static/$(Configuration)/$(PlatformName)/ + + ../../bin/ visualinfo @@ -105,12 +185,8 @@ Disabled true Level3 - ../../include;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/debug-mx\ - .\static/debug-mx\visualinfo.pch - .\static/debug-mx\ - .\static/debug-mx\ + .\static/$(Configuration)visualinfo.pch EnableFastChecks @@ -128,8 +204,41 @@ true true Console - ../../bin/visualinfo-mxd.exe - ../../lib/glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)visualinfo.pch + EnableFastChecks + + + .\../../bin\visualinfo.tlb + + + 0x0409 + _DEBUG;GLEW_MX;%(PreprocessorDefinitions) + + + true + .\../../bin\visualinfo.bsc + + + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ @@ -140,12 +249,8 @@ Disabled true Level3 - ../../include;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/debug\ - .\static/debug\visualinfo.pch - .\static/debug\ - .\static/debug\ + .\static/$(Configuration)visualinfo.pch EnableFastChecks @@ -157,14 +262,47 @@ true - .\../../bin\visualinfo.bsc + $(TargetDir)visualinfo.bsc true true Console - ../../bin/visualinfod.exe - ../../lib/glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)visualinfo.pch + EnableFastChecks + + + .\../../bin\visualinfo.tlb + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + $(TargetDir)visualinfo.bsc + + + true + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ @@ -176,12 +314,8 @@ MaxSpeed true Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/release-mx\ - .\static/release-mx\visualinfo.pch - .\static/release-mx\ - .\static/release-mx\ + WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)visualinfo.pch .\../../bin\visualinfo.tlb @@ -197,8 +331,40 @@ true Console - ../../bin/visualinfo-mx.exe - ../../lib/glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)visualinfo.pch + + + .\../../bin\visualinfo.tlb + + + 0x0409 + NDEBUG;GLEW_MX;%(PreprocessorDefinitions) + + + true + .\../../bin\visualinfo.bsc + + + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ @@ -210,12 +376,8 @@ MaxSpeed true Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/release\ - .\static/release\visualinfo.pch - .\static/release\ - .\static/release\ + WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)visualinfo.pch .\../../bin\visualinfo.tlb @@ -231,15 +393,69 @@ true Console - .\../../bin\visualinfo.exe - ../../lib/glew32s.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + glew32s.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .\static/$(Configuration)visualinfo.pch + + + .\../../bin\visualinfo.tlb + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\../../bin\visualinfo.bsc + + + true + Console + $(OutDir)$(TargetName)$(TargetExt) + glew32s.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + + + + + .\static/$(Configuration)visualinfo.pch + + + $(OutDir)$(TargetName)$(TargetExt) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + + + + + .\static/$(Configuration)visualinfo.pch + + + $(OutDir)$(TargetName)$(TargetExt) + glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) + $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - + + {664e6f0d-6784-4760-9565-d54f8eb1edf4} + From b56f8e70e86d663fa7cd95ba0f17166d4722f931 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 20 Jul 2013 22:06:29 -0500 Subject: [PATCH 04/10] Revert "Use git instead of clone to download OpenGL registry." This reverts commit 974679c6d884fda238cdceb5c8211fc269cde1a3. --- auto/Makefile | 6 ++-- auto/bin/make_list_gl.pl | 66 ------------------------------------- auto/bin/update_registry.sh | 33 +++++++++++++++++++ auto/src/glew_head.c | 15 --------- auto/src/glew_init_gl.c | 47 ++++++++------------------ auto/src/glew_init_gl_2.c | 44 ------------------------- 6 files changed, 48 insertions(+), 163 deletions(-) delete mode 100755 auto/bin/make_list_gl.pl create mode 100755 auto/bin/update_registry.sh delete mode 100644 auto/src/glew_init_gl_2.c diff --git a/auto/Makefile b/auto/Makefile index 64f59c4..113313f 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -197,9 +197,8 @@ $(S.DEST)/glew.c: $(EXT)/.dummy $(BIN)/make_init.pl GL $(GL_CORE_SPEC) >> $@ $(BIN)/make_init.pl GL $(GL_EXT_SPEC) >> $@ cat $(SRC)/glew_init_gl.c >> $@ - $(BIN)/make_list_gl.pl $(GL_CORE_SPEC) | grep -v '\"GL_VERSION' >> $@ - cat $(SRC)/glew_init_gl_2.c >> $@ - $(BIN)/make_list_gl.pl $(GL_EXT_SPEC) >> $@ + $(BIN)/make_list.pl $(GL_CORE_SPEC) | grep -v '\"GL_VERSION' >> $@ + $(BIN)/make_list.pl $(GL_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}\n" >> $@ echo -e "\n#if defined(_WIN32)" >> $@ echo -e "\n#if !defined(GLEW_MX)" >> $@ @@ -275,7 +274,6 @@ $(S.DEST)/glew_init.c: $(EXT)/.dummy $(BIN)/make_init.pl GL $(GL_EXT_SPEC) >> $@ cat $(SRC)/glew_init_gl.c >> $@ $(BIN)/make_list.pl $(GL_CORE_SPEC) | grep -v '\"GL_VERSION' >> $@ - cat $(SRC)/glew_init_gl_2.c >> $@ $(BIN)/make_list.pl $(GL_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}\n\n#if defined(_WIN32)\n" >> $@; $(BIN)/make_init.pl WGL $(WGL_EXT_SPEC) >> $@ diff --git a/auto/bin/make_list_gl.pl b/auto/bin/make_list_gl.pl deleted file mode 100755 index 0ac08f5..0000000 --- a/auto/bin/make_list_gl.pl +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/perl -## -## Copyright (C) 2002-2008, Marcelo E. Magallon -## Copyright (C) 2002-2008, Milan Ikits -## -## This program is distributed under the terms and conditions of the GNU -## General Public License Version 2 as published by the Free Software -## Foundation or, at your option, any later version. - -use strict; -use warnings; - -do 'bin/make.pl'; - -#--------------------------------------------------------------------------------------- - -# function pointer definition -sub make_init_call($%) -{ - my $name = prefixname($_[0]); - return " r = r || (" . $_[0] . " = (PFN" . (uc $_[0]) . "PROC)glewGetProcAddress(\"" . $name . "\")) == NULL;"; -} - -#--------------------------------------------------------------------------------------- - -my @extlist = (); -my %extensions = (); - -if (@ARGV) -{ - @extlist = @ARGV; - - foreach my $ext (sort @extlist) - { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); - - my $extvar = $extname; - $extvar =~ s/GL(X*)_/GL$1EW_/; - - my $extpre = $extname; - $extpre =~ s/^(W?)GL(X?).*$/\l$1gl\l$2ew/; - - #my $pextvar = prefix_varname($extvar); - - print "#ifdef $extname\n"; - - if (length($extstring)) - { - print " CONST_CAST(" . $extvar . ") = _glewSearchExtensionArray(\"$extstring\", extArrayStart, extArrayEnd);\n"; - } - - if (keys %$functions) - { - if ($extname =~ /WGL_.*/) - { - print " if (glewExperimental || " . $extvar . "|| crippled) CONST_CAST(" . $extvar . ")= !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n"; - } - else - { - print " if (glewExperimental || " . $extvar . ") CONST_CAST(" . $extvar . ") = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n"; - } - } - print "#endif /* $extname */\n"; - } - -} diff --git a/auto/bin/update_registry.sh b/auto/bin/update_registry.sh new file mode 100755 index 0000000..54b0fd2 --- /dev/null +++ b/auto/bin/update_registry.sh @@ -0,0 +1,33 @@ +#!/bin/sh +## +## Copyright (C) 2002-2008, Marcelo E. Magallon +## Copyright (C) 2002-2008, Milan Ikits +## +## This program is distributed under the terms and conditions of the GNU +## General Public License Version 2 as published by the Free Software +## Foundation or, at your option, any later version. + +set -e + +if [ ! -d $1 ] ; then + mkdir -p $1 +fi +cd $1 + +# wget used to return 0 (success), but more recent versions +# don't so we don't want to bail out in failure mode +# eventhough everything is fine. + +set +e + +wget \ + --mirror \ + --no-parent \ + --no-host-directories \ + --cut-dirs=2 \ + --accept=txt,html \ + $2 + +echo 'wget exit code: ' $? + +exit 0 diff --git a/auto/src/glew_head.c b/auto/src/glew_head.c index 3bfd4d7..252d55a 100644 --- a/auto/src/glew_head.c +++ b/auto/src/glew_head.c @@ -247,18 +247,3 @@ static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, c } return GL_FALSE; } - -static GLboolean _glewSearchExtensionArray (const char* name, const GLubyte** start, const GLubyte** end) -{ - const GLubyte** p; - GLuint len = _glewStrLen((const GLubyte*)name); - p = start; - while (p < end) - { - GLuint n = _glewStrCLen(*p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, *p, n)) return GL_TRUE; - p += 1; - } - return GL_FALSE; -} - diff --git a/auto/src/glew_init_gl.c b/auto/src/glew_init_gl.c index 8f7ad33..5f9bf65 100644 --- a/auto/src/glew_init_gl.c +++ b/auto/src/glew_init_gl.c @@ -1,38 +1,14 @@ /* ------------------------------------------------------------------------- */ GLboolean GLEWAPIENTRY glewGetExtension (const char* name) -{ +{ const GLubyte* start; const GLubyte* end; - GLuint dot; - GLint numExt, i, major; - /* query opengl version to decide how to enumerate extensions */ - start = glGetString(GL_VERSION); - dot = _glewStrCLen(start, '.'); - if (dot == 0) - return GL_FALSE; - major = start[dot-1]-'0'; - - if (major >= 3) - { - glGetIntegerv(GL_NUM_EXTENSIONS, &numExt); - for(i = 0; i < numExt; ++i) - { - start = glGetStringi(GL_EXTENSIONS, i); - end = start + _glewStrLen(start); - if(_glewSearchExtension(name, start, end) == GL_TRUE) - return GL_TRUE; - } - } - else - { - start = (const GLubyte*)glGetString(GL_EXTENSIONS); - if (start == 0) - return GL_FALSE; - end = start + _glewStrLen(start); - return _glewSearchExtension(name, start, end); - } - return GL_FALSE; + start = (const GLubyte*)glGetString(GL_EXTENSIONS); + if (start == 0) + return GL_FALSE; + end = start + _glewStrLen(start); + return _glewSearchExtension(name, start, end); } /* ------------------------------------------------------------------------- */ @@ -45,9 +21,6 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) const GLubyte* s; GLuint dot; GLint major, minor; - const GLubyte* extArray[1000]; - const GLubyte** extArrayStart; - const GLubyte** extArrayEnd; const GLubyte* extStart; const GLubyte* extEnd; /* query opengl version */ @@ -89,4 +62,10 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) CONST_CAST(GLEW_VERSION_1_1) = GLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE; } - /* initialize core */ + /* query opengl extensions string */ + extStart = glGetString(GL_EXTENSIONS); + if (extStart == 0) + extStart = (const GLubyte*)""; + extEnd = extStart + _glewStrLen(extStart); + + /* initialize extensions */ diff --git a/auto/src/glew_init_gl_2.c b/auto/src/glew_init_gl_2.c deleted file mode 100644 index fe6f540..0000000 --- a/auto/src/glew_init_gl_2.c +++ /dev/null @@ -1,44 +0,0 @@ - - /* get extensions */ - if (GLEW_VERSION_3_0 == GL_TRUE) - { - GLint numExt; - GLint i; - glGetIntegerv(GL_NUM_EXTENSIONS, &numExt); - - for(i = 0; i < numExt; ++i) - { - extArray[i] = glGetStringi(GL_EXTENSIONS, i); - } - - extArrayStart = &extArray[0]; - extArrayEnd = &extArray[i]; - } - else - { - int i; - - extStart = glGetString(GL_EXTENSIONS); - if (extStart == 0) - extStart = (const GLubyte*)""; - extEnd = extStart + _glewStrLen(extStart); - i = 0; - - while (extStart < extEnd) - { - int len = _glewStrCLen(extStart, ' '); - - if (len > 0) - { - extArray[i] = extStart; - i += 1; - } - - extStart += len + 1; - } - - extArrayStart = &extArray[0]; - extArrayEnd = &extArray[i]; - } - - /* initialize extensions */ From 2ce935a13f2552d2e0bf87101a22b35ed8e1fa5c Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 20 Jul 2013 22:11:31 -0500 Subject: [PATCH 05/10] Revamp dist-src and dist-win32 Makefile targets. --- Makefile | 162 +++++++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 84 deletions(-) diff --git a/Makefile b/Makefile index d218d45..e6f08a7 100644 --- a/Makefile +++ b/Makefile @@ -45,13 +45,12 @@ BINDIR ?= $(GLEW_DEST)/bin LIBDIR ?= $(GLEW_DEST)/lib INCDIR ?= $(GLEW_DEST)/include/GL -TARDIR = ../glew-$(GLEW_VERSION) -TARBALL = ../glew-$(GLEW_VERSION).tar.gz +DIST_NAME ?= glew-$(GLEW_VERSION) +DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip +DIST_SRC_TGZ ?= $(shell pwd)/$(DIST_NAME).tgz +DIST_WIN32 ?= $(shell pwd)/$(DIST_NAME)-win32.zip -DIST_DIR = glew-$(GLEW_VERSION) -DIST_WIN32 = glew-$(GLEW_VERSION)-win32.zip -DIST_SRC_ZIP = glew-$(GLEW_VERSION).zip -DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz +DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) # To disable stripping of binaries either: # - use STRIP= on gmake command-line @@ -321,86 +320,81 @@ distclean: clean # Distributions dist-win32: - $(RM) -r $(TARDIR) - mkdir -p $(TARDIR) - mkdir -p $(TARDIR)/bin - mkdir -p $(TARDIR)/lib - cp -a include $(TARDIR) - cp -a doc $(TARDIR) - cp -a *.txt $(TARDIR) - cp -a lib/glew32.lib $(TARDIR)/lib - cp -a lib/glew32s.lib $(TARDIR)/lib - cp -a lib/glew32mx.lib $(TARDIR)/lib - cp -a lib/glew32mxs.lib $(TARDIR)/lib - cp -a bin/glew32.dll $(TARDIR)/bin - cp -a bin/glew32mx.dll $(TARDIR)/bin - cp -a bin/glewinfo.exe $(TARDIR)/bin - cp -a bin/visualinfo.exe $(TARDIR)/bin - find $(TARDIR) -name CVS -o -name .cvsignore | xargs $(RM) -r - find $(TARDIR) -name .svn | xargs $(RM) -r - find $(TARDIR) -name "*.patch" | xargs $(RM) -r - unix2dos $(TARDIR)/include/GL/*.h - unix2dos $(TARDIR)/doc/*.txt - unix2dos $(TARDIR)/doc/*.html - unix2dos $(TARDIR)/*.txt - rm -f ../$(DIST_WIN32) - cd .. && zip -rv9 $(DIST_WIN32) $(DIST_DIR) + $(RM) -r $(DIST_DIR) + mkdir -p $(DIST_DIR) + cp -a include $(DIST_DIR) + cp -a doc $(DIST_DIR) + cp -a *.txt $(DIST_DIR) + cp -a bin $(DIST_DIR) + cp -a lib $(DIST_DIR) + $(RM) -f $(DIST_DIR)/bin/*/*/*.pdb $(DIST_DIR)/bin/*/*/*.exp + $(RM) -f $(DIST_DIR)/bin/*/*/glewinfo-*.exe $(DIST_DIR)/bin/*/*/visualinfo-*.exe + $(RM) -f $(DIST_DIR)/lib/*/*/*.pdb $(DIST_DIR)/lib/*/*/*.exp + unix2dos $(DIST_DIR)/include/GL/*.h + unix2dos $(DIST_DIR)/doc/*.txt + unix2dos $(DIST_DIR)/doc/*.html + unix2dos $(DIST_DIR)/*.txt + rm -f $(DIST_WIN32) + cd $(DIST_DIR)/.. && zip -rv9 $(DIST_WIN32) $(DIST_NAME) + $(RM) -r $(DIST_DIR) dist-src: - $(RM) -r $(TARDIR) - mkdir -p $(TARDIR) - mkdir -p $(TARDIR)/bin - mkdir -p $(TARDIR)/lib - cp -a auto $(TARDIR) - $(RM) -Rf $(TARDIR)/auto/registry - cp -a build $(TARDIR) - cp -a config $(TARDIR) - cp -a src $(TARDIR) - cp -a doc $(TARDIR) - cp -a include $(TARDIR) - cp -a *.txt $(TARDIR) - cp -a Makefile $(TARDIR) - cp -a glew.pc.in $(TARDIR) - find $(TARDIR) -name '*.o' | xargs $(RM) -r - find $(TARDIR) -name '*~' | xargs $(RM) -r - find $(TARDIR) -name CVS -o -name .cvsignore | xargs $(RM) -r - find $(TARDIR) -name .svn | xargs $(RM) -r - find $(TARDIR) -name "*.patch" | xargs $(RM) -r - dos2unix $(TARDIR)/Makefile - dos2unix $(TARDIR)/auto/Makefile - dos2unix $(TARDIR)/config/* - unix2dos $(TARDIR)/auto/core/* - unix2dos $(TARDIR)/auto/extensions/* - find $(TARDIR) -name '*.h' | xargs unix2dos - find $(TARDIR) -name '*.c' | xargs unix2dos - find $(TARDIR) -name '*.txt' | xargs unix2dos - find $(TARDIR) -name '*.html' | xargs unix2dos - find $(TARDIR) -name '*.css' | xargs unix2dos - find $(TARDIR) -name '*.sh' | xargs unix2dos - find $(TARDIR) -name '*.pl' | xargs unix2dos - find $(TARDIR) -name 'Makefile' | xargs unix2dos - find $(TARDIR) -name '*.in' | xargs unix2dos - find $(TARDIR) -name '*.pm' | xargs unix2dos - find $(TARDIR) -name '*.rc' | xargs unix2dos - rm -f ../$(DIST_SRC_ZIP) - cd .. && zip -rv9 $(DIST_SRC_ZIP) $(DIST_DIR) - dos2unix $(TARDIR)/Makefile - dos2unix $(TARDIR)/auto/Makefile - dos2unix $(TARDIR)/config/* - dos2unix $(TARDIR)/auto/core/* - dos2unix $(TARDIR)/auto/extensions/* - find $(TARDIR) -name '*.h' | xargs dos2unix - find $(TARDIR) -name '*.c' | xargs dos2unix - find $(TARDIR) -name '*.txt' | xargs dos2unix - find $(TARDIR) -name '*.html' | xargs dos2unix - find $(TARDIR) -name '*.css' | xargs dos2unix - find $(TARDIR) -name '*.sh' | xargs dos2unix - find $(TARDIR) -name '*.pl' | xargs dos2unix - find $(TARDIR) -name 'Makefile' | xargs dos2unix - find $(TARDIR) -name '*.in' | xargs dos2unix - find $(TARDIR) -name '*.pm' | xargs dos2unix - find $(TARDIR) -name '*.rc' | xargs dos2unix - cd .. && env GZIP=-9 tar cvzf $(DIST_SRC_TGZ) $(DIST_DIR) + $(RM) -r $(DIST_DIR) + mkdir -p $(DIST_DIR) + mkdir -p $(DIST_DIR)/bin + mkdir -p $(DIST_DIR)/lib + cp -a auto $(DIST_DIR) + $(RM) -Rf $(DIST_DIR)/auto/registry + cp -a build $(DIST_DIR) + cp -a config $(DIST_DIR) + cp -a src $(DIST_DIR) + cp -a doc $(DIST_DIR) + cp -a include $(DIST_DIR) + cp -a *.txt $(DIST_DIR) + cp -a Makefile $(DIST_DIR) + cp -a glew.pc.in $(DIST_DIR) + find $(DIST_DIR) -name '*.o' | xargs $(RM) -r + find $(DIST_DIR) -name '*~' | xargs $(RM) -r + find $(DIST_DIR) -name CVS -o -name .cvsignore | xargs $(RM) -r + find $(DIST_DIR) -name .svn | xargs $(RM) -r + find $(DIST_DIR) -name "*.patch" | xargs $(RM) -r + dos2unix $(DIST_DIR)/Makefile + dos2unix $(DIST_DIR)/auto/Makefile + dos2unix $(DIST_DIR)/config/* + unix2dos $(DIST_DIR)/auto/core/* + unix2dos $(DIST_DIR)/auto/extensions/* + find $(DIST_DIR) -name '*.h' | xargs unix2dos + find $(DIST_DIR) -name '*.c' | xargs unix2dos + find $(DIST_DIR) -name '*.txt' | xargs unix2dos + find $(DIST_DIR) -name '*.html' | xargs unix2dos + find $(DIST_DIR) -name '*.css' | xargs unix2dos + find $(DIST_DIR) -name '*.sh' | xargs unix2dos + find $(DIST_DIR) -name '*.pl' | xargs unix2dos + find $(DIST_DIR) -name 'Makefile' | xargs unix2dos + find $(DIST_DIR) -name '*.in' | xargs unix2dos + find $(DIST_DIR) -name '*.pm' | xargs unix2dos + find $(DIST_DIR) -name '*.rc' | xargs unix2dos + rm -f $(DIST_SRC_ZIP) + cd $(DIST_DIR)/.. && zip -rv9 $(DIST_SRC_ZIP) $(DIST_NAME) + dos2unix $(DIST_DIR)/Makefile + dos2unix $(DIST_DIR)/auto/Makefile + dos2unix $(DIST_DIR)/config/* + dos2unix $(DIST_DIR)/auto/core/* + dos2unix $(DIST_DIR)/auto/extensions/* + find $(DIST_DIR) -name '*.h' | xargs dos2unix + find $(DIST_DIR) -name '*.c' | xargs dos2unix + find $(DIST_DIR) -name '*.txt' | xargs dos2unix + find $(DIST_DIR) -name '*.html' | xargs dos2unix + find $(DIST_DIR) -name '*.css' | xargs dos2unix + find $(DIST_DIR) -name '*.sh' | xargs dos2unix + find $(DIST_DIR) -name '*.pl' | xargs dos2unix + find $(DIST_DIR) -name 'Makefile' | xargs dos2unix + find $(DIST_DIR) -name '*.in' | xargs dos2unix + find $(DIST_DIR) -name '*.pm' | xargs dos2unix + find $(DIST_DIR) -name '*.rc' | xargs dos2unix + rm -f $(DIST_SRC_TGZ) + cd $(DIST_DIR)/.. && env GZIP=-9 tar cvzf $(DIST_SRC_TGZ) $(DIST_NAME) + $(RM) -r $(DIST_DIR) extensions: $(MAKE) -C auto From 9898ca210daa381ab13e7e098693c8c4e57887fc Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 20 Jul 2013 23:46:05 -0500 Subject: [PATCH 06/10] Regularize paths in VC10 projects with back slash. Other tidy-up for Visual Studio quality of life. --- build/vc10/glew.sln | 0 build/vc10/glew_shared.vcxproj | 76 ++++++++--------------- build/vc10/glew_static.vcxproj | 68 +++++++-------------- build/vc10/glewinfo.vcxproj | 106 +++++++++++++-------------------- build/vc10/visualinfo.vcxproj | 104 ++++++++++++-------------------- 5 files changed, 126 insertions(+), 228 deletions(-) mode change 100755 => 100644 build/vc10/glew.sln mode change 100755 => 100644 build/vc10/glew_shared.vcxproj mode change 100755 => 100644 build/vc10/glew_static.vcxproj mode change 100755 => 100644 build/vc10/glewinfo.vcxproj mode change 100755 => 100644 build/vc10/visualinfo.vcxproj diff --git a/build/vc10/glew.sln b/build/vc10/glew.sln old mode 100755 new mode 100644 diff --git a/build/vc10/glew_shared.vcxproj b/build/vc10/glew_shared.vcxproj old mode 100755 new mode 100644 index f730fb1..1e5100d --- a/build/vc10/glew_shared.vcxproj +++ b/build/vc10/glew_shared.vcxproj @@ -1,4 +1,4 @@ - + @@ -101,50 +101,50 @@ - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32mx - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32mx - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32 - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32 - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32mxd - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32mxd - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32d - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - shared/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glew32d @@ -159,12 +159,10 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch true NDEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true Win32 @@ -174,14 +172,13 @@ true - $(TargetDir)glew_shared.bsc true true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) /ignore:4089 @@ -200,12 +197,10 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch true NDEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true @@ -214,14 +209,13 @@ true - $(TargetDir)glew_shared.bsc true true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) /ignore:4089 @@ -240,12 +234,10 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch true NDEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true Win32 @@ -255,14 +247,13 @@ true - $(TargetDir)glew_shared.bsc true true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) /ignore:4089 @@ -281,12 +272,10 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch true NDEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true @@ -295,14 +284,13 @@ true - $(TargetDir)glew_shared.bsc true true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) /ignore:4089 @@ -320,13 +308,11 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch EnableFastChecks true _DEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true Win32 @@ -336,7 +322,6 @@ true - $(TargetDir)glew_shared.bsc true @@ -344,7 +329,7 @@ true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) @@ -361,13 +346,11 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch EnableFastChecks true _DEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true @@ -376,7 +359,6 @@ true - $(TargetDir)glew_shared.bsc true @@ -384,7 +366,7 @@ true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) @@ -399,7 +381,6 @@ Disabled true WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch EnableFastChecks Level3 $(INCLUDE_DIR) @@ -407,7 +388,6 @@ true _DEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true Win32 @@ -417,7 +397,6 @@ true - $(TargetDir)glew_shared.bsc true @@ -425,7 +404,7 @@ true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) @@ -440,7 +419,6 @@ Disabled true WIN32;WIN32_LEAN_AND_MEAN;GLEW_BUILD;%(PreprocessorDefinitions) - .\shared/$(Configuration)\glew_shared.pch EnableFastChecks Level3 $(INCLUDE_DIR) @@ -448,7 +426,6 @@ true _DEBUG;%(PreprocessorDefinitions) - .\../../lib\glew_shared.tlb true @@ -457,7 +434,6 @@ true - $(TargetDir)glew_shared.bsc true @@ -465,7 +441,7 @@ true Console $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/$(TargetName).lib + $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib 0x62AA0000 opengl32.lib;%(AdditionalDependencies) @@ -485,4 +461,4 @@ - \ No newline at end of file + diff --git a/build/vc10/glew_static.vcxproj b/build/vc10/glew_static.vcxproj old mode 100755 new mode 100644 index b97246d..5a72a87 --- a/build/vc10/glew_static.vcxproj +++ b/build/vc10/glew_static.vcxproj @@ -1,4 +1,4 @@ - + @@ -33,14 +33,6 @@ Release x64 - - Template - Win32 - - - Template - x64 - @@ -129,52 +121,52 @@ - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32mxsd - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32mxsd - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32s - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32s - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32mxs - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32mxs - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32sd - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32sd - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -187,7 +179,6 @@ ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks - .\static/$(Configuration)glew_static.pch 0x0409 @@ -195,7 +186,6 @@ true - .\../../lib\glew_static.bsc true @@ -214,7 +204,6 @@ ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks - .\static/$(Configuration)glew_static.pch 0x0409 @@ -222,7 +211,6 @@ true - .\../../lib\glew_static.bsc true @@ -241,7 +229,6 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/$(Configuration)glew_static.pch 0x0409 @@ -249,7 +236,6 @@ true - .\../../lib\glew_static.bsc true @@ -268,7 +254,6 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/$(Configuration)glew_static.pch 0x0409 @@ -276,7 +261,6 @@ true - .\../../lib\glew_static.bsc true @@ -295,7 +279,6 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/$(Configuration)glew_static.pch 0x0409 @@ -303,7 +286,6 @@ true - .\../../lib\glew_static.bsc true @@ -322,7 +304,6 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - .\static/$(Configuration)glew_static.pch 0x0409 @@ -330,7 +311,6 @@ true - .\../../lib\glew_static.bsc true @@ -348,7 +328,6 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks - .\static/$(Configuration)glew_static.pch 0x0409 @@ -356,7 +335,6 @@ true - $(TargetDir)glew_static.bsc true @@ -374,7 +352,6 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks - .\static/$(Configuration)glew_static.pch 0x0409 @@ -382,7 +359,6 @@ true - $(TargetDir)glew_static.bsc true @@ -393,13 +369,11 @@ ../../include;%(AdditionalIncludeDirectories) - .\static/$(Configuration)glew_static.pch ../../include;%(AdditionalIncludeDirectories) - .\static/$(Configuration)glew_static.pch diff --git a/build/vc10/glewinfo.vcxproj b/build/vc10/glewinfo.vcxproj old mode 100755 new mode 100644 index 127fc7b..21d34d4 --- a/build/vc10/glewinfo.vcxproj +++ b/build/vc10/glewinfo.vcxproj @@ -1,4 +1,4 @@ - + @@ -33,14 +33,6 @@ Release x64 - - Template - Win32 - - - Template - x64 - @@ -121,62 +113,62 @@ - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfo-mx - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfo-mx - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfo-mxd - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfo-mxd - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfod - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfod - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfo - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false glewinfo - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ glewinfo - static/$(Configuration)/$(PlatformName)/ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ glewinfo - static/$(Configuration)/$(PlatformName)/ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -188,10 +180,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -199,14 +190,13 @@ true - .\../../bin\glewinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -219,10 +209,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -230,14 +219,13 @@ true - .\../../bin\glewinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -249,11 +237,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch EnableFastChecks - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -261,7 +248,6 @@ true - .\../../bin\glewinfo.bsc true @@ -269,7 +255,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -281,11 +267,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch EnableFastChecks - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -293,7 +278,6 @@ true - .\../../bin\glewinfo.bsc true @@ -301,7 +285,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -313,11 +297,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch EnableFastChecks - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -325,7 +308,6 @@ true - $(TargetDir)glewinfo.bsc true @@ -333,7 +315,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32sd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -345,11 +327,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch EnableFastChecks - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -357,7 +338,6 @@ true - $(TargetDir)glewinfo.bsc true @@ -365,7 +345,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32sd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -378,10 +358,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -389,14 +368,13 @@ true - .\../../bin\glewinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32s.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -409,10 +387,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)glewinfo.pch - .\../../bin\glewinfo.tlb + .\..\..\bin\glewinfo.tlb 0x0409 @@ -420,34 +397,31 @@ true - .\../../bin\glewinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32s.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - .\static/$(Configuration)glewinfo.pch $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - .\static/$(Configuration)glewinfo.pch @@ -461,4 +435,4 @@ - \ No newline at end of file + diff --git a/build/vc10/visualinfo.vcxproj b/build/vc10/visualinfo.vcxproj old mode 100755 new mode 100644 index 4cf4b8b..e31d7a6 --- a/build/vc10/visualinfo.vcxproj +++ b/build/vc10/visualinfo.vcxproj @@ -1,4 +1,4 @@ - + @@ -33,14 +33,6 @@ Release x64 - - Template - Win32 - - - Template - x64 - @@ -121,60 +113,60 @@ - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfo-mxd - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfo-mxd - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfod - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfod - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfo-mx - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfo-mx - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfo - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ - static/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ false visualinfo - $(BIN_DIR)/$(Configuration)/$(PlatformName)/ + $(BIN_DIR)\$(Configuration)\$(PlatformName)\ visualinfo - static/$(Configuration)/$(PlatformName)/ + tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - ../../bin/ + ..\..\bin/ visualinfo @@ -186,11 +178,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch EnableFastChecks - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -198,7 +189,6 @@ true - .\../../bin\visualinfo.bsc true @@ -206,7 +196,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -218,11 +208,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch EnableFastChecks - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -230,7 +219,6 @@ true - .\../../bin\visualinfo.bsc true @@ -238,7 +226,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -250,11 +238,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch EnableFastChecks - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -262,7 +249,6 @@ true - $(TargetDir)visualinfo.bsc true @@ -270,7 +256,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -282,11 +268,10 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch EnableFastChecks - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -294,7 +279,6 @@ true - $(TargetDir)visualinfo.bsc true @@ -302,7 +286,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -315,10 +299,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -326,14 +309,13 @@ true - .\../../bin\visualinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -346,10 +328,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -357,14 +338,13 @@ true - .\../../bin\visualinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -377,10 +357,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -388,14 +367,13 @@ true - .\../../bin\visualinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32s.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -408,10 +386,9 @@ true Level3 WIN32;WIN32_LEAN_AND_MEAN;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - .\static/$(Configuration)visualinfo.pch - .\../../bin\visualinfo.tlb + .\..\..\bin\visualinfo.tlb 0x0409 @@ -419,34 +396,31 @@ true - .\../../bin\visualinfo.bsc true Console $(OutDir)$(TargetName)$(TargetExt) glew32s.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - .\static/$(Configuration)visualinfo.pch $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - .\static/$(Configuration)visualinfo.pch $(OutDir)$(TargetName)$(TargetExt) glew32sd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)/$(Configuration)/$(PlatformName)/ + $(LIB_DIR)\$(Configuration)\$(PlatformName)\ @@ -460,4 +434,4 @@ - \ No newline at end of file + From 7b433cd402edbc8199f0f4ce662f340e444d5f78 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 21 Jul 2013 01:40:05 -0500 Subject: [PATCH 07/10] auto/bin/update_registry.sh isn't used anymore. --- auto/bin/update_registry.sh | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100755 auto/bin/update_registry.sh diff --git a/auto/bin/update_registry.sh b/auto/bin/update_registry.sh deleted file mode 100755 index 54b0fd2..0000000 --- a/auto/bin/update_registry.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -## -## Copyright (C) 2002-2008, Marcelo E. Magallon -## Copyright (C) 2002-2008, Milan Ikits -## -## This program is distributed under the terms and conditions of the GNU -## General Public License Version 2 as published by the Free Software -## Foundation or, at your option, any later version. - -set -e - -if [ ! -d $1 ] ; then - mkdir -p $1 -fi -cd $1 - -# wget used to return 0 (success), but more recent versions -# don't so we don't want to bail out in failure mode -# eventhough everything is fine. - -set +e - -wget \ - --mirror \ - --no-parent \ - --no-host-directories \ - --cut-dirs=2 \ - --accept=txt,html \ - $2 - -echo 'wget exit code: ' $? - -exit 0 From 87ce8715b253a42478e88333278037cbd75ecc03 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 21 Jul 2013 21:00:30 -0500 Subject: [PATCH 08/10] Add support for OpenGL 4.4 --- auto/bin/filter_gl_ext.sh | 4 ++++ auto/core/gl/GL_VERSION_4_4 | 5 +++++ auto/src/glew_init_gl.c | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 auto/core/gl/GL_VERSION_4_4 diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index ee823e1..2aa58c4 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -468,5 +468,9 @@ EOT for i in $1/GL_REGAL_*; do perl -e 's#http://www.opengl.org/registry/specs/gl/REGAL/.*#https://github.com/p3/regal/tree/master/doc/extensions#g' -pi $i; done for i in $1/GL_ANGLE_*; do perl -e 's#http://www.opengl.org/registry/specs/gl/ANGLE/.*#https://code.google.com/p/angleproject/source/browse/\#git%2Fextensions#g' -pi $i; done +# Filter out GL_NV_blend_equation_advanced_coherent enums and functions + head -n3 $1/GL_NV_blend_equation_advanced_coherent > tmp + mv tmp $1/GL_NV_blend_equation_advanced_coherent + # clean up rm -f $1/*.bak diff --git a/auto/core/gl/GL_VERSION_4_4 b/auto/core/gl/GL_VERSION_4_4 new file mode 100644 index 0000000..dfa3bf2 --- /dev/null +++ b/auto/core/gl/GL_VERSION_4_4 @@ -0,0 +1,5 @@ +GL_VERSION_4_4 +http://www.opengl.org/registry/ + + GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 + diff --git a/auto/src/glew_init_gl.c b/auto/src/glew_init_gl.c index 5f9bf65..39efd2c 100644 --- a/auto/src/glew_init_gl.c +++ b/auto/src/glew_init_gl.c @@ -44,7 +44,8 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) } else { - CONST_CAST(GLEW_VERSION_4_3) = ( major > 4 ) || ( major == 4 && minor >= 3 ) ? GL_TRUE : GL_FALSE; + CONST_CAST(GLEW_VERSION_4_4) = ( major > 4 ) || ( major == 4 && minor >= 4 ) ? GL_TRUE : GL_FALSE; + CONST_CAST(GLEW_VERSION_4_3) = GLEW_VERSION_4_4 == GL_TRUE || ( major == 4 && minor >= 3 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_4_2) = GLEW_VERSION_4_3 == GL_TRUE || ( major == 4 && minor >= 2 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_4_1) = GLEW_VERSION_4_2 == GL_TRUE || ( major == 4 && minor >= 1 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_4_0) = GLEW_VERSION_4_1 == GL_TRUE || ( major == 4 ) ? GL_TRUE : GL_FALSE; From 4853c8effee3e769b47c7d6e8d68a00be1f61082 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 21 Jul 2013 21:01:37 -0500 Subject: [PATCH 09/10] Documentation updates for GLEW 1.10.0 release. --- auto/doc/index.html | 16 +- auto/doc/log.html | 60 +++ auto/src/header.html | 4 +- doc/advanced.html | 4 +- doc/basic.html | 4 +- doc/build.html | 4 +- doc/credits.html | 4 +- doc/glew.html | 864 ++++++++++++++++++++++--------------------- doc/glxew.html | 4 +- doc/index.html | 20 +- doc/install.html | 4 +- doc/log.html | 64 +++- doc/wglew.html | 4 +- 13 files changed, 597 insertions(+), 459 deletions(-) diff --git a/auto/doc/index.html b/auto/doc/index.html index c3569e2..1650bec 100644 --- a/auto/doc/index.html +++ b/auto/doc/index.html @@ -13,7 +13,7 @@ Mac OS X, FreeBSD, Irix, and Solaris. GLEW is distributed as source and precompiled binaries.
The latest release is -1.9.0[08-06-12]: +1.10.0[07-22-13]:

@@ -27,8 +27,8 @@ The latest release is Source -ZIP |  -TGZ +ZIP |  +TGZ @@ -36,8 +36,7 @@ The latest release is Binaries -Windows 32-bit |  -64-bit  +Windows 32-bit and 64-bit |  @@ -50,10 +49,10 @@ The latest release is An up-to-date copy is also available using git:

    -
  • Sourceforge
    -git clone git://git.code.sf.net/p/glew/code glew
     
  • github
    git clone https://github.com/nigels-com/glew.git glew
     
    • +
  • Sourceforge
    +git clone git://git.code.sf.net/p/glew/code glew
     

@@ -67,7 +66,7 @@ An up-to-date copy is also available using git

Supported Extensions

-The latest release contains support for OpenGL 4.3 and the following extensions: +The latest release contains support for OpenGL 4.4 and the following extensions: