From: Joe Groff Date: Wed, 14 Sep 2011 18:24:50 +0000 (-0700) Subject: windows, windows.directx: move directx libraries out of windows vocab X-Git-Tag: 0.97~4142 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=c14f0871960c43d863b1b347b693a9421a24bd3b windows, windows.directx: move directx libraries out of windows vocab --- diff --git a/basis/windows/directx/d2d1/d2d1.factor b/basis/windows/directx/d2d1/d2d1.factor index 4a8b44f63d..d8fedc003a 100644 --- a/basis/windows/directx/d2d1/d2d1.factor +++ b/basis/windows/directx/d2d1/d2d1.factor @@ -1,6 +1,7 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d2dbasetypes windows.directx.dcommon -windows.directx.dxgi windows.directx.dxgiformat windows.ole32 windows.types ; +windows.com.syntax windows.directx windows.directx.d2dbasetypes +windows.directx.dcommon windows.directx.dxgi windows.directx.dxgiformat +windows.ole32 windows.types ; IN: windows.directx.d2d1 LIBRARY: d2d1 diff --git a/basis/windows/directx/d3d10/d3d10.factor b/basis/windows/directx/d3d10/d3d10.factor index 4f23d41218..cd9bf58405 100644 --- a/basis/windows/directx/d3d10/d3d10.factor +++ b/basis/windows/directx/d3d10/d3d10.factor @@ -1,6 +1,6 @@ USING: alien.syntax alien.c-types classes.struct windows.types -windows.directx.dxgiformat windows.com.syntax windows.com windows.ole32 -windows.directx.dxgitype ; +windows.directx windows.directx.dxgiformat windows.com.syntax +windows.com windows.ole32 windows.directx.dxgitype ; IN: windows.directx.d3d10 LIBRARY: d3d10 diff --git a/basis/windows/directx/d3d10_1/d3d10_1.factor b/basis/windows/directx/d3d10_1/d3d10_1.factor index 7d4db6ecde..d3281b02b4 100644 --- a/basis/windows/directx/d3d10_1/d3d10_1.factor +++ b/basis/windows/directx/d3d10_1/d3d10_1.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct -windows.com.syntax windows.directx.d3d10 +windows.com.syntax windows.directx windows.directx.d3d10 windows.directx.d3d10misc windows.directx.dxgi windows.directx.dxgiformat windows.types ; IN: windows.directx.d3d10_1 diff --git a/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor b/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor index 4664b90523..03a390155a 100644 --- a/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor +++ b/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d3d10 windows.directx.d3d10shader -windows.types ; +windows.com.syntax windows.directx windows.directx.d3d10 +windows.directx.d3d10shader windows.types ; IN: windows.directx.d3d10_1shader LIBRARY: d3d10_1 diff --git a/basis/windows/directx/d3d10effect/d3d10effect.factor b/basis/windows/directx/d3d10effect/d3d10effect.factor index 873f8e26e8..5322e042ab 100644 --- a/basis/windows/directx/d3d10effect/d3d10effect.factor +++ b/basis/windows/directx/d3d10effect/d3d10effect.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d3d10 windows.directx.d3d10misc -windows.directx.d3d10shader windows.types ; +windows.com.syntax windows.directx windows.directx.d3d10 +windows.directx.d3d10misc windows.directx.d3d10shader windows.types ; IN: windows.directx.d3d10effect LIBRARY: d3d10 diff --git a/basis/windows/directx/d3d10misc/d3d10misc.factor b/basis/windows/directx/d3d10misc/d3d10misc.factor index a5809009ea..d9be571fd6 100644 --- a/basis/windows/directx/d3d10misc/d3d10misc.factor +++ b/basis/windows/directx/d3d10misc/d3d10misc.factor @@ -1,5 +1,6 @@ USING: alien.c-types alien.syntax windows.com windows.com.syntax -windows.directx.d3d10 windows.directx.dxgi windows.types ; +windows.directx windows.directx.d3d10 windows.directx.dxgi +windows.types ; IN: windows.directx.d3d10misc LIBRARY: d3d10 diff --git a/basis/windows/directx/d3d10shader/d3d10shader.factor b/basis/windows/directx/d3d10shader/d3d10shader.factor index 787698e503..a4c0899760 100644 --- a/basis/windows/directx/d3d10shader/d3d10shader.factor +++ b/basis/windows/directx/d3d10shader/d3d10shader.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.com.syntax windows.directx.d3d10 windows.directx.d3d10misc -windows.types ; +windows.types windows.directx ; IN: windows.directx.d3d10shader LIBRARY: d3d10 diff --git a/basis/windows/directx/d3d11/d3d11.factor b/basis/windows/directx/d3d11/d3d11.factor index 8382c11dc2..29cbbad1bb 100644 --- a/basis/windows/directx/d3d11/d3d11.factor +++ b/basis/windows/directx/d3d11/d3d11.factor @@ -1,6 +1,7 @@ USING: alien.syntax alien.c-types classes.struct windows.types windows.directx.dxgiformat windows.com.syntax windows.com windows.ole32 -windows.directx.dxgitype windows.directx.dxgi windows.directx.d3dcommon ; +windows.directx.dxgitype windows.directx.dxgi windows.directx.d3dcommon +windows.directx ; IN: windows.directx.d3d11 LIBRARY: d3d11 diff --git a/basis/windows/directx/d3d9/d3d9.factor b/basis/windows/directx/d3d9/d3d9.factor index a612f72ccd..a132a735bd 100644 --- a/basis/windows/directx/d3d9/d3d9.factor +++ b/basis/windows/directx/d3d9/d3d9.factor @@ -1,6 +1,6 @@ USING: alien.syntax windows.types alien.c-types windows.directx.d3d9types -windows.com.syntax windows.com windows.directx.d3d9caps windows.ole32 -windows.kernel32 ; +windows.com.syntax windows.com windows.directx windows.directx.d3d9caps +windows.ole32 windows.kernel32 ; IN: windows.directx.d3d9 LIBRARY: d3d9 diff --git a/basis/windows/directx/d3dcompiler/d3dcompiler.factor b/basis/windows/directx/d3dcompiler/d3dcompiler.factor index 90babe638a..3d24128e9a 100644 --- a/basis/windows/directx/d3dcompiler/d3dcompiler.factor +++ b/basis/windows/directx/d3dcompiler/d3dcompiler.factor @@ -1,4 +1,4 @@ -USING: alien.c-types alien.syntax windows.ole32 windows.types ; +USING: alien.c-types alien.syntax windows.directx windows.ole32 windows.types ; IN: windows.directx.d3dcompiler LIBRARY: d3dcompiler diff --git a/basis/windows/directx/d3dcsx/d3dcsx.factor b/basis/windows/directx/d3dcsx/d3dcsx.factor index 86b804dd19..d88c829b31 100644 --- a/basis/windows/directx/d3dcsx/d3dcsx.factor +++ b/basis/windows/directx/d3dcsx/d3dcsx.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.com.syntax -windows.directx.d3d11 windows.types ; +windows.directx windows.directx.d3d11 windows.types ; IN: windows.directx.d3dcsx LIBRARY: d3dcsx diff --git a/basis/windows/directx/d3dx10async/d3dx10async.factor b/basis/windows/directx/d3dx10async/d3dx10async.factor index e7fbcf573e..ecaea244d8 100644 --- a/basis/windows/directx/d3dx10async/d3dx10async.factor +++ b/basis/windows/directx/d3dx10async/d3dx10async.factor @@ -1,5 +1,6 @@ -USING: alien.syntax windows.directx.d3d10 windows.directx.d3d10misc -windows.directx.d3d10shader windows.directx.d3dx10core windows.types ; +USING: alien.syntax windows.directx windows.directx.d3d10 +windows.directx.d3d10misc windows.directx.d3d10shader +windows.directx.d3dx10core windows.types ; IN: windows.directx.d3dx10async LIBRARY: d3dx10 diff --git a/basis/windows/directx/d3dx10core/d3dx10core.factor b/basis/windows/directx/d3dx10core/d3dx10core.factor index 38271b543a..8c5b1fef28 100644 --- a/basis/windows/directx/d3dx10core/d3dx10core.factor +++ b/basis/windows/directx/d3dx10core/d3dx10core.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d3d10 +windows.com.syntax windows.directx windows.directx.d3d10 windows.directx.d3d10misc windows.directx.d3dx10math windows.directx.dxgi windows.gdi32 windows.types ; IN: windows.directx.d3dx10core diff --git a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor b/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor index 9eb563e60c..5d61952041 100644 --- a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor +++ b/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d3d10 +windows.com.syntax windows.directx windows.directx.d3d10 windows.directx.d3d10misc windows.types windows.directx.d3dx10math ; IN: windows.directx.d3dx10mesh diff --git a/basis/windows/directx/d3dx10tex/d3dx10tex.factor b/basis/windows/directx/d3dx10tex/d3dx10tex.factor index c4e3712b9f..0a0689c171 100644 --- a/basis/windows/directx/d3dx10tex/d3dx10tex.factor +++ b/basis/windows/directx/d3dx10tex/d3dx10tex.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct -windows.directx.d3d10 windows.directx.d3d10misc +windows.directx windows.directx.d3d10 windows.directx.d3d10misc windows.directx.d3dx10async windows.directx.dxgiformat windows.types ; IN: windows.directx.d3dx10tex diff --git a/basis/windows/directx/d3dx11async/d3dx11async.factor b/basis/windows/directx/d3dx11async/d3dx11async.factor index bea30ecb1a..8728456aca 100644 --- a/basis/windows/directx/d3dx11async/d3dx11async.factor +++ b/basis/windows/directx/d3dx11async/d3dx11async.factor @@ -1,4 +1,4 @@ -USING: alien.syntax windows.directx.d3d10misc +USING: alien.syntax windows.directx windows.directx.d3d10misc windows.directx.d3d10shader windows.directx.d3d11 windows.directx.d3dx11core windows.directx.d3dx11tex windows.types ; IN: windows.directx.d3dx11async diff --git a/basis/windows/directx/d3dx11core/d3dx11core.factor b/basis/windows/directx/d3dx11core/d3dx11core.factor index fc8ce1a1bb..877b87b672 100644 --- a/basis/windows/directx/d3dx11core/d3dx11core.factor +++ b/basis/windows/directx/d3dx11core/d3dx11core.factor @@ -1,5 +1,5 @@ -USING: alien.syntax windows.types windows.com.syntax alien.c-types windows.com -windows.directx.d3d11 ; +USING: alien.syntax windows.directx windows.types windows.com.syntax +alien.c-types windows.com windows.directx.d3d11 ; IN: windows.directx.d3dx11core LIBRARY: d3dx11 diff --git a/basis/windows/directx/d3dx11tex/d3dx11tex.factor b/basis/windows/directx/d3dx11tex/d3dx11tex.factor index 19425535e8..41f2338f33 100644 --- a/basis/windows/directx/d3dx11tex/d3dx11tex.factor +++ b/basis/windows/directx/d3dx11tex/d3dx11tex.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct -windows.directx.d3d10misc windows.directx.d3d11 +windows.directx windows.directx.d3d10misc windows.directx.d3d11 windows.directx.d3dx11core windows.directx.dxgiformat windows.types ; IN: windows.directx.d3dx11tex diff --git a/basis/windows/directx/d3dx9anim/d3dx9anim.factor b/basis/windows/directx/d3dx9anim/d3dx9anim.factor index 9864d64e3b..34c1a55d6e 100644 --- a/basis/windows/directx/d3dx9anim/d3dx9anim.factor +++ b/basis/windows/directx/d3dx9anim/d3dx9anim.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d3d9 +windows.com.syntax windows.directx windows.directx.d3d9 windows.directx.d3dx9core windows.directx.d3dx9math windows.directx.d3dx9mesh windows.directx.d3dx9xof windows.types ; diff --git a/basis/windows/directx/d3dx9core/d3dx9core.factor b/basis/windows/directx/d3dx9core/d3dx9core.factor index f963b03294..861dc46ef7 100644 --- a/basis/windows/directx/d3dx9core/d3dx9core.factor +++ b/basis/windows/directx/d3dx9core/d3dx9core.factor @@ -1,6 +1,6 @@ USING: alien.syntax windows.types windows.directx.d3d9 windows.com.syntax -windows.com windows.directx.d3dx9math windows.directx.d3d9types classes.struct -windows.gdi32 ; +windows.com windows.directx windows.directx.d3dx9math windows.directx.d3d9types +classes.struct windows.gdi32 ; IN: windows.directx.d3dx9core LIBRARY: d3dx9 diff --git a/basis/windows/directx/d3dx9effect/d3dx9effect.factor b/basis/windows/directx/d3dx9effect/d3dx9effect.factor index e3833362f8..523569d84e 100644 --- a/basis/windows/directx/d3dx9effect/d3dx9effect.factor +++ b/basis/windows/directx/d3dx9effect/d3dx9effect.factor @@ -1,5 +1,5 @@ USING: alien.syntax classes.struct math windows.com -windows.com.syntax windows.directx.d3d9 +windows.com.syntax windows.directx windows.directx.d3d9 windows.directx.d3d9types windows.directx.d3dx9core windows.directx.d3dx9math windows.directx.d3dx9shader windows.types ; diff --git a/basis/windows/directx/d3dx9math/d3dx9math.factor b/basis/windows/directx/d3dx9math/d3dx9math.factor index 6d37af514c..394c740267 100644 --- a/basis/windows/directx/d3dx9math/d3dx9math.factor +++ b/basis/windows/directx/d3dx9math/d3dx9math.factor @@ -1,5 +1,5 @@ USING: math classes.struct windows.types alien.syntax windows.directx.d3d9types -windows.com.syntax windows.com windows.directx.d3d9 ; +windows.com.syntax windows.com windows.directx windows.directx.d3d9 ; IN: windows.directx.d3dx9math LIBRARY: d3dx9 diff --git a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor index e4cb3dd63b..d3a5a7e637 100644 --- a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor @@ -1,5 +1,5 @@ USING: alien.syntax alien.c-types windows.directx.d3d9types math -classes.struct windows.types windows.com.syntax windows.com +classes.struct windows.types windows.com.syntax windows.com windows.directx windows.directx.d3d9 windows.directx.d3dx9core windows.directx.d3dx9math windows.directx.d3dx9xof ; IN: windows.directx.d3dx9mesh diff --git a/basis/windows/directx/d3dx9shader/d3dx9shader.factor b/basis/windows/directx/d3dx9shader/d3dx9shader.factor index b6e455b57f..ad215ee33a 100644 --- a/basis/windows/directx/d3dx9shader/d3dx9shader.factor +++ b/basis/windows/directx/d3dx9shader/d3dx9shader.factor @@ -1,7 +1,7 @@ USING: alien.c-types alien.syntax classes.struct math -windows.com windows.com.syntax windows.directx.d3d9 -windows.directx.d3dx9core windows.directx.d3dx9math -windows.types ; +windows.com windows.com.syntax windows.directx +windows.directx.d3d9 windows.directx.d3dx9core +windows.directx.d3dx9math windows.types ; IN: windows.directx.d3dx9shader LIBRARY: d3dx9 diff --git a/basis/windows/directx/d3dx9shape/d3dx9shape.factor b/basis/windows/directx/d3dx9shape/d3dx9shape.factor index 33b3308b72..8f3bab428a 100644 --- a/basis/windows/directx/d3dx9shape/d3dx9shape.factor +++ b/basis/windows/directx/d3dx9shape/d3dx9shape.factor @@ -1,6 +1,6 @@ -USING: alien.c-types alien.syntax windows.directx.d3d9 -windows.directx.d3dx9core windows.directx.d3dx9mesh -windows.types ; +USING: alien.c-types alien.syntax windows.directx +windows.directx.d3d9 windows.directx.d3dx9core +windows.directx.d3dx9mesh windows.types ; IN: windows.directx.d3dx9shape LIBRARY: d3dx9 diff --git a/basis/windows/directx/d3dx9tex/d3dx9tex.factor b/basis/windows/directx/d3dx9tex/d3dx9tex.factor index c1de9d0d0b..ad3d9e12b4 100644 --- a/basis/windows/directx/d3dx9tex/d3dx9tex.factor +++ b/basis/windows/directx/d3dx9tex/d3dx9tex.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct math -windows.directx.d3d9 windows.directx.d3d9types +windows.directx windows.directx.d3d9 windows.directx.d3d9types windows.directx.d3dx9core windows.directx.d3dx9shader windows.types ; IN: windows.directx.d3dx9tex diff --git a/basis/windows/directx/d3dx9xof/d3dx9xof.factor b/basis/windows/directx/d3dx9xof/d3dx9xof.factor index bd55854e29..c27848219f 100644 --- a/basis/windows/directx/d3dx9xof/d3dx9xof.factor +++ b/basis/windows/directx/d3dx9xof/d3dx9xof.factor @@ -1,5 +1,5 @@ -USING: alien.syntax classes.struct windows.com -windows.com.syntax windows.kernel32 windows.ole32 windows.types ; +USING: alien.syntax classes.struct windows.com windows.com.syntax +windows.directx windows.kernel32 windows.ole32 windows.types ; IN: windows.directx.d3dx9xof LIBRARY: d3dx9 diff --git a/basis/windows/directx/dinput/dinput.factor b/basis/windows/directx/dinput/dinput.factor index 56cd4937ce..53b03e7888 100644 --- a/basis/windows/directx/dinput/dinput.factor +++ b/basis/windows/directx/dinput/dinput.factor @@ -1,6 +1,6 @@ USING: windows.kernel32 windows.ole32 windows.com windows.com.syntax alien alien.c-types alien.syntax kernel system namespaces math -classes.struct windows.types ; +classes.struct windows.types windows.directx ; IN: windows.directx.dinput LIBRARY: dinput diff --git a/basis/windows/directx/directx.factor b/basis/windows/directx/directx.factor new file mode 100644 index 0000000000..0e647b9f7f --- /dev/null +++ b/basis/windows/directx/directx.factor @@ -0,0 +1,23 @@ +USING: alien sequences alien.libraries ; +IN: windows.directx + +{ + { "dinput" "dinput8.dll" stdcall } + { "xinput" "xinput1_3.dll" stdcall } + { "dxgi" "dxgi.dll" stdcall } + { "d2d1" "d2d1.dll" stdcall } + { "d3d9" "d3d9.dll" stdcall } + { "d3d10" "d3d10.dll" stdcall } + { "d3d10_1" "d3d10_1.dll" stdcall } + { "d3d11" "d3d11.dll" stdcall } + { "d3dcompiler" "d3dcompiler_42.dll" stdcall } + { "d3dcsx" "d3dcsx_42.dll" stdcall } + { "d3dx9" "d3dx9_42.dll" stdcall } + { "d3dx10" "d3dx10_42.dll" stdcall } + { "d3dx11" "d3dx11_42.dll" stdcall } + { "dwrite" "dwrite.dll" stdcall } + { "x3daudio" "x3daudio1_6.dll" stdcall } + { "xactengine" "xactengine3_5.dll" stdcall } + { "xapofx" "xapofx1_3.dll" stdcall } + { "xaudio2" "xaudio2_5.dll" stdcall } +} [ first3 add-library ] each diff --git a/basis/windows/directx/dwrite/dwrite.factor b/basis/windows/directx/dwrite/dwrite.factor index b538f5b933..c226325704 100755 --- a/basis/windows/directx/dwrite/dwrite.factor +++ b/basis/windows/directx/dwrite/dwrite.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.com.syntax windows.directx.dcommon windows.kernel32 -windows.ole32 windows.types ; +windows.ole32 windows.types windows.directx ; IN: windows.directx.dwrite LIBRARY: dwrite diff --git a/basis/windows/directx/dxgi/dxgi.factor b/basis/windows/directx/dxgi/dxgi.factor index 5d2ae5b990..58f6ab3d31 100644 --- a/basis/windows/directx/dxgi/dxgi.factor +++ b/basis/windows/directx/dxgi/dxgi.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.com.syntax windows.directx.dxgiformat windows.directx.dxgitype windows.kernel32 -windows.ole32 windows.types ; +windows.ole32 windows.types windows.directx ; IN: windows.directx.dxgi LIBRARY: dxgi diff --git a/basis/windows/directx/x3daudio/x3daudio.factor b/basis/windows/directx/x3daudio/x3daudio.factor index f6b1e639b1..46781a256b 100644 --- a/basis/windows/directx/x3daudio/x3daudio.factor +++ b/basis/windows/directx/x3daudio/x3daudio.factor @@ -1,4 +1,4 @@ -USING: alien.c-types alien.syntax classes.struct +USING: alien.c-types alien.syntax classes.struct windows.directx windows.directx.d3dx10math windows.types ; IN: windows.directx.x3daudio diff --git a/basis/windows/directx/xact3/xact3.factor b/basis/windows/directx/xact3/xact3.factor index f9ebf246b9..12a890ff1e 100644 --- a/basis/windows/directx/xact3/xact3.factor +++ b/basis/windows/directx/xact3/xact3.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.xaudio2 windows.kernel32 -windows.types ; +windows.com.syntax windows.directx windows.directx.xaudio2 +windows.kernel32 windows.types ; IN: windows.directx.xact3 LIBRARY: xactengine diff --git a/basis/windows/directx/xapofx/xapofx.factor b/basis/windows/directx/xapofx/xapofx.factor index 594ad9ecbe..fdbaef1fdd 100644 --- a/basis/windows/directx/xapofx/xapofx.factor +++ b/basis/windows/directx/xapofx/xapofx.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.ole32 windows.types ; +windows.directx windows.ole32 windows.types ; IN: windows.directx.xapofx LIBRARY: xapofx diff --git a/basis/windows/directx/xaudio2/xaudio2.factor b/basis/windows/directx/xaudio2/xaudio2.factor index a9b2a63f81..e28ce3af87 100644 --- a/basis/windows/directx/xaudio2/xaudio2.factor +++ b/basis/windows/directx/xaudio2/xaudio2.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct math -windows.com windows.com.syntax windows.directx.audiodefs -windows.types ; +windows.com windows.com.syntax windows.directx +windows.directx.audiodefs windows.types ; IN: windows.directx.xaudio2 LIBRARY: xaudio2 diff --git a/basis/windows/directx/xinput/xinput.factor b/basis/windows/directx/xinput/xinput.factor index 618aeb4840..b274374033 100755 --- a/basis/windows/directx/xinput/xinput.factor +++ b/basis/windows/directx/xinput/xinput.factor @@ -1,4 +1,5 @@ -USING: alien.c-types alien.syntax classes.struct windows.kernel32 windows.types ; +USING: alien.c-types alien.syntax classes.struct windows.directx +windows.kernel32 windows.types ; IN: windows.directx.xinput LIBRARY: xinput diff --git a/basis/windows/windows.factor b/basis/windows/windows.factor index f3bf040bcb..9a91a6fe20 100644 --- a/basis/windows/windows.factor +++ b/basis/windows/windows.factor @@ -7,7 +7,6 @@ CONSTANT: MAX_UNICODE_PATH 32768 { { "advapi32" "advapi32.dll" stdcall } - { "dinput" "dinput8.dll" stdcall } { "gdi32" "gdi32.dll" stdcall } { "user32" "user32.dll" stdcall } { "kernel32" "kernel32.dll" stdcall } @@ -23,21 +22,4 @@ CONSTANT: MAX_UNICODE_PATH 32768 { "ole32" "ole32.dll" stdcall } { "usp10" "usp10.dll" stdcall } { "psapi" "psapi.dll" stdcall } - { "xinput" "xinput1_3.dll" stdcall } - { "dxgi" "dxgi.dll" stdcall } - { "d2d1" "d2d1.dll" stdcall } - { "d3d9" "d3d9.dll" stdcall } - { "d3d10" "d3d10.dll" stdcall } - { "d3d10_1" "d3d10_1.dll" stdcall } - { "d3d11" "d3d11.dll" stdcall } - { "d3dcompiler" "d3dcompiler_42.dll" stdcall } - { "d3dcsx" "d3dcsx_42.dll" stdcall } - { "d3dx9" "d3dx9_42.dll" stdcall } - { "d3dx10" "d3dx10_42.dll" stdcall } - { "d3dx11" "d3dx11_42.dll" stdcall } - { "dwrite" "dwrite.dll" stdcall } - { "x3daudio" "x3daudio1_6.dll" stdcall } - { "xactengine" "xactengine3_5.dll" stdcall } - { "xapofx" "xapofx1_3.dll" stdcall } - { "xaudio2" "xaudio2_5.dll" stdcall } } [ first3 add-library ] each