steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

win32 bootstrap fixes, remove some opengl words from win32

erg 2006-03-27 00:24:12 +00:00
parent 75faf59621
commit 358692d263
4 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/bootstrap/boot-stage2.factor
View File

@ -14,9 +14,9 @@ recrossref
"/library/unix/load.factor" run-resource "/library/unix/load.factor" run-resource
] when ] when
windows? [ ] when
"/library/win32/load.factor" run-resource windows? [
] when "/library/win32/load.factor" run-resource
] when ] when
parse-command-line parse-command-line
@ -49,8 +49,10 @@ recrossref
"/library/x11/load.factor" run-resource "/library/x11/load.factor" run-resource
] when ] when
windows? [ windows? "native-io" get and [
"/contrib/win32/load.factor" run-resource "/library/win32/ui.factor" run-resource
"/library/win32/clipboard.factor" run-resource
compile-all
] when ] when
] when ] when

13
library/opengl/gl.factor
View File

@ -4,7 +4,7 @@
! This file is based on the gl.h that comes with xorg-x11 6.8.2 ! This file is based on the gl.h that comes with xorg-x11 6.8.2
IN: opengl IN: opengl
USING: alien kernel ; USING: alien kernel sequences words ;
windows? [ windows? [
"gl" "opengl32.dll" "stdcall" add-library "gl" "opengl32.dll" "stdcall" add-library
@ -1171,22 +1171,23 @@ FUNCTION: void glPopName ( ) ;
: GL_ALIASED_POINT_SIZE_RANGE HEX: 846D ; inline : GL_ALIASED_POINT_SIZE_RANGE HEX: 846D ; inline
: GL_ALIASED_LINE_WIDTH_RANGE HEX: 846E ; 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 ) ; 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, GLsizei width, GLsizei height, GLsizei depth, GLint border,
GLenum format, GLenum type, GLvoid* pixels ) ; 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, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
GLenum format, GLenum type, GLvoid* pixels ) ; 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 xoffset, GLint yoffset, GLint zoffset,
GLint x, GLint y, GLsizei width, GLsizei height ) ; GLint x, GLint y, GLsizei width, GLsizei height ) ;
windows? [
{ glDrawRangeElements glTexImage3D glTexSubImage3D glCopyTexSubImage3D } [ forget ] each
] unless ] unless

23
library/opengl/glu.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2005 Alex Chapman. ! Copyright (C) 2005 Alex Chapman.
! See http://factor.sf.net/license.txt for BSD license. ! See http://factor.sf.net/license.txt for BSD license.
IN: opengl 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 ! These are defined as structs in glu.h, but we only ever use pointers to them
TYPEDEF: void* GLUnurbs* TYPEDEF: void* GLUnurbs*
@ -195,14 +195,16 @@ FUNCTION: void gluBeginCurve ( GLUnurbs* nurb ) ;
FUNCTION: void gluBeginPolygon ( GLUtesselator* tess ) ; FUNCTION: void gluBeginPolygon ( GLUtesselator* tess ) ;
FUNCTION: void gluBeginSurface ( GLUnurbs* nurb ) ; FUNCTION: void gluBeginSurface ( GLUnurbs* nurb ) ;
FUNCTION: void gluBeginTrim ( 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? [ windows? [
FUNCTION: GLint gluBuild1DMipmapLevels ( GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, void* data ) ; { gluBuild1DMipmapLevels gluBuild1DMipmaps gluBuild2DMipmapLevels gluBuild2DMipmaps gluBuild3DMipmapLevels gluBuild3DMipmaps gluCheckExtension } [ forget ] each
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 ) ;
] unless ] unless
FUNCTION: void gluCylinder ( GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks ) ; FUNCTION: void gluCylinder ( GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks ) ;
FUNCTION: void gluDeleteNurbsRenderer ( GLUnurbs* nurb ) ; FUNCTION: void gluDeleteNurbsRenderer ( GLUnurbs* nurb ) ;
@ -224,9 +226,10 @@ FUNCTION: GLUquadric* gluNewQuadric ( ) ;
FUNCTION: GLUtesselator* gluNewTess ( ) ; FUNCTION: GLUtesselator* gluNewTess ( ) ;
FUNCTION: void gluNextContour ( GLUtesselator* tess, GLenum type ) ; FUNCTION: void gluNextContour ( GLUtesselator* tess, GLenum type ) ;
FUNCTION: void gluNurbsCallback ( GLUnurbs* nurb, GLenum which, GLUfuncptr CallBackFunc ) ; FUNCTION: void gluNurbsCallback ( GLUnurbs* nurb, GLenum which, GLUfuncptr CallBackFunc ) ;
FUNCTION: void gluNurbsCallbackData ( GLUnurbs* nurb, GLvoid* userData ) ;
FUNCTION: void gluNurbsCallbackDataEXT ( GLUnurbs* nurb, GLvoid* userData ) ;
windows? [ windows? [
FUNCTION: void gluNurbsCallbackData ( GLUnurbs* nurb, GLvoid* userData ) ; { gluNurbsCallbackData gluNurbsCallbackDataEXT } [ forget ] each
FUNCTION: void gluNurbsCallbackDataEXT ( GLUnurbs* nurb, GLvoid* userData ) ;
] unless ] unless
FUNCTION: void gluNurbsCurve ( GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type ) ; 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 ) ; FUNCTION: void gluNurbsProperty ( GLUnurbs* nurb, GLenum property, GLfloat value ) ;

59
library/win32/load.factor
View File

@ -1,24 +1,35 @@
USING: alien io kernel parser sequences ; IN: scratchpad
USING: alien compiler kernel namespaces parser sequences words ;
"kernel32" "kernel32.dll" "stdcall" add-library
"user32" "user32.dll" "stdcall" add-library {
"gdi32" "gdi32.dll" "stdcall" add-library { "gdi32" "gdi32" }
"winsock" "ws2_32.dll" "stdcall" add-library { "user32" "user32" }
"mswsock" "mswsock.dll" "stdcall" add-library { "kernel32" "kernel32" }
"libc" "msvcrt.dll" "cdecl" add-library { "winsock" "ws2_32" }
{ "mswsock" "mswsock" }
[ } [ first2 add-simple-library ] each
"/library/win32/win32-io.factor" "libc" "msvcrt.dll" "cdecl" add-library
"/library/win32/win32-errors.factor"
"/library/win32/winsock.factor" {
"/library/win32/win32-io-internals.factor" "windows-messages"
"/library/win32/win32-stream.factor" "types"
"/library/win32/win32-server.factor" "gdi32"
"/library/bootstrap/win32-io.factor" "kernel32"
] [ "user32"
run-resource "opengl32"
] each "utils"
IN: kernel "win32-io"
"win32-errors"
: default-shell "ui" ; "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" ? ;