From 358692d2635d4f619f29d3849b3ae185272d9f91 Mon Sep 17 00:00:00 2001 From: erg Date: Mon, 27 Mar 2006 00:24:12 +0000 Subject: [PATCH] win32 bootstrap fixes, remove some opengl words from win32 --- library/bootstrap/boot-stage2.factor | 12 +++--- library/opengl/gl.factor | 13 +++--- library/opengl/glu.factor | 23 ++++++----- library/win32/load.factor | 59 +++++++++++++++++----------- 4 files changed, 62 insertions(+), 45 deletions(-) diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor index 3621ece1fb..4822c29a62 100644 --- a/library/bootstrap/boot-stage2.factor +++ b/library/bootstrap/boot-stage2.factor @@ -14,9 +14,9 @@ recrossref "/library/unix/load.factor" run-resource ] when - windows? [ - "/library/win32/load.factor" run-resource - ] when + ] when + windows? [ + "/library/win32/load.factor" run-resource ] when parse-command-line @@ -49,8 +49,10 @@ recrossref "/library/x11/load.factor" run-resource ] when - windows? [ - "/contrib/win32/load.factor" run-resource + windows? "native-io" get and [ + "/library/win32/ui.factor" run-resource + "/library/win32/clipboard.factor" run-resource + compile-all ] when ] when diff --git a/library/opengl/gl.factor b/library/opengl/gl.factor index 1f4f96413c..11d5bd10ec 100644 --- a/library/opengl/gl.factor +++ b/library/opengl/gl.factor @@ -4,7 +4,7 @@ ! This file is based on the gl.h that comes with xorg-x11 6.8.2 IN: opengl -USING: alien kernel ; +USING: alien kernel sequences words ; windows? [ "gl" "opengl32.dll" "stdcall" add-library @@ -1171,22 +1171,23 @@ FUNCTION: void glPopName ( ) ; : GL_ALIASED_POINT_SIZE_RANGE HEX: 846D ; inline : GL_ALIASED_LINE_WIDTH_RANGE HEX: 846E ; inline -windows? [ - FUNCTION: void glDrawRangeElements ( GLenum mode, GLuint start, GLuint end, +FUNCTION: void glDrawRangeElements ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid* indices ) ; - FUNCTION: void glTexImage3D ( GLenum target, GLint level, GLint internalFormat, +FUNCTION: void glTexImage3D ( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid* pixels ) ; - FUNCTION: void glTexSubImage3D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, +FUNCTION: void glTexSubImage3D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid* pixels ) ; - FUNCTION: void glCopyTexSubImage3D ( GLenum target, GLint level, +FUNCTION: void glCopyTexSubImage3D ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) ; +windows? [ + { glDrawRangeElements glTexImage3D glTexSubImage3D glCopyTexSubImage3D } [ forget ] each ] unless diff --git a/library/opengl/glu.factor b/library/opengl/glu.factor index cb673510f4..716b7f150d 100644 --- a/library/opengl/glu.factor +++ b/library/opengl/glu.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005 Alex Chapman. ! See http://factor.sf.net/license.txt for BSD license. IN: opengl -USING: alien kernel ; +USING: alien kernel sequences words ; ! These are defined as structs in glu.h, but we only ever use pointers to them TYPEDEF: void* GLUnurbs* @@ -195,14 +195,16 @@ FUNCTION: void gluBeginCurve ( GLUnurbs* nurb ) ; FUNCTION: void gluBeginPolygon ( GLUtesselator* tess ) ; FUNCTION: void gluBeginSurface ( GLUnurbs* nurb ) ; FUNCTION: void gluBeginTrim ( GLUnurbs* nurb ) ; + +FUNCTION: GLint gluBuild1DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; +FUNCTION: GLint gluBuild1DMipmaps ( GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, void* data ) ; +FUNCTION: GLint gluBuild2DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; +FUNCTION: GLint gluBuild2DMipmaps ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, void* data ) ; +FUNCTION: GLint gluBuild3DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; +FUNCTION: GLint gluBuild3DMipmaps ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void* data ) ; +FUNCTION: GLboolean gluCheckExtension ( GLubyte* extName, GLubyte* extString ) ; windows? [ - FUNCTION: GLint gluBuild1DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; - FUNCTION: GLint gluBuild1DMipmaps ( GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, void* data ) ; - FUNCTION: GLint gluBuild2DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; - FUNCTION: GLint gluBuild2DMipmaps ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, void* data ) ; - FUNCTION: GLint gluBuild3DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; - FUNCTION: GLint gluBuild3DMipmaps ( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void* data ) ; - FUNCTION: GLboolean gluCheckExtension ( GLubyte* extName, GLubyte* extString ) ; + { gluBuild1DMipmapLevels gluBuild1DMipmaps gluBuild2DMipmapLevels gluBuild2DMipmaps gluBuild3DMipmapLevels gluBuild3DMipmaps gluCheckExtension } [ forget ] each ] unless FUNCTION: void gluCylinder ( GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks ) ; FUNCTION: void gluDeleteNurbsRenderer ( GLUnurbs* nurb ) ; @@ -224,9 +226,10 @@ FUNCTION: GLUquadric* gluNewQuadric ( ) ; FUNCTION: GLUtesselator* gluNewTess ( ) ; FUNCTION: void gluNextContour ( GLUtesselator* tess, GLenum type ) ; FUNCTION: void gluNurbsCallback ( GLUnurbs* nurb, GLenum which, GLUfuncptr CallBackFunc ) ; +FUNCTION: void gluNurbsCallbackData ( GLUnurbs* nurb, GLvoid* userData ) ; +FUNCTION: void gluNurbsCallbackDataEXT ( GLUnurbs* nurb, GLvoid* userData ) ; windows? [ - FUNCTION: void gluNurbsCallbackData ( GLUnurbs* nurb, GLvoid* userData ) ; - FUNCTION: void gluNurbsCallbackDataEXT ( GLUnurbs* nurb, GLvoid* userData ) ; + { gluNurbsCallbackData gluNurbsCallbackDataEXT } [ forget ] each ] unless FUNCTION: void gluNurbsCurve ( GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type ) ; FUNCTION: void gluNurbsProperty ( GLUnurbs* nurb, GLenum property, GLfloat value ) ; diff --git a/library/win32/load.factor b/library/win32/load.factor index 3be22d611c..7d3b8941d4 100644 --- a/library/win32/load.factor +++ b/library/win32/load.factor @@ -1,24 +1,35 @@ -USING: alien io kernel parser sequences ; - -"kernel32" "kernel32.dll" "stdcall" add-library -"user32" "user32.dll" "stdcall" add-library -"gdi32" "gdi32.dll" "stdcall" add-library -"winsock" "ws2_32.dll" "stdcall" add-library -"mswsock" "mswsock.dll" "stdcall" add-library -"libc" "msvcrt.dll" "cdecl" add-library - -[ - "/library/win32/win32-io.factor" - "/library/win32/win32-errors.factor" - "/library/win32/winsock.factor" - "/library/win32/win32-io-internals.factor" - "/library/win32/win32-stream.factor" - "/library/win32/win32-server.factor" - "/library/bootstrap/win32-io.factor" -] [ - run-resource -] each - -IN: kernel - -: default-shell "ui" ; +IN: scratchpad +USING: alien compiler kernel namespaces parser sequences words ; + +{ + { "gdi32" "gdi32" } + { "user32" "user32" } + { "kernel32" "kernel32" } + { "winsock" "ws2_32" } + { "mswsock" "mswsock" } +} [ first2 add-simple-library ] each +"libc" "msvcrt.dll" "cdecl" add-library + +{ + "windows-messages" + "types" + "gdi32" + "kernel32" + "user32" + "opengl32" + "utils" + + "win32-io" + "win32-errors" + "winsock" + "win32-io-internals" + "win32-stream" + "win32-server" +} [ "/library/win32/" swap ".factor" append3 run-resource ] each + +"native-io" get [ + "/library/bootstrap/win32-io.factor" run-resource +] when + +IN: kernel +: default-shell "native-io" get "ui" "tty" ? ;