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 4a8b44f63d0555f89ed92f7303f41cd90220af8b..d8fedc003a4d0d811ad985e5484345715cfde667 100644 (file)
--- 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 4f23d41218e4e23057cbba625002f48b10738424..cd9bf5840515baec8758cde6b67a749bfa92bf51 100644 (file)
--- 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 7d4db6ecde74875aa284c588af862ad220f982e0..d3281b02b416172e3cdaaf97901fa9f7ac47690f 100644 (file)
--- 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 4664b90523229ab6fa2e88ef727a1d08da77cf89..03a390155abec20e4f1a607a9b2ea2c7c20694ff 100644 (file)
--- 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 873f8e26e8a69acac1a87a8f4e738080015b5d7c..5322e042abf9e50931a9ebcd05aa14fcc956ed57 100644 (file)
--- 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 a5809009ea6f6041518c136986ee3e8ae2e05c97..d9be571fd6f19cbd98bf29a0f224865ab3e4adce 100644 (file)
--- 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 787698e5030dc1a6f189e758beb39a47f76aac1c..a4c0899760e60483c7c1b12095c6b16c3c37c1d4 100644 (file)
--- 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 8382c11dc28857f80196d3275c12067ff678c83a..29cbbad1bb2305f49c1aae493b4d32316d0fddba 100644 (file)
--- 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 a612f72ccd7470f71bbf52b26d53552338a60f81..a132a735bdb74be463c6aa7889e6c6af29e780cd 100644 (file)
--- 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 90babe638a136f67c5637fdbbef869bdd637fcd7..3d24128e9a3e7519595d03e5a462ff377bfd4769 100644 (file)
--- 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 86b804dd1936ccc50e0016b039bc160d6636c0ad..d88c829b31e03a5cbd56008d418c4ecf4f8a975c 100644 (file)
--- 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 e7fbcf573e63fb054e2ad3556f58d62649933d27..ecaea244d874e906bfc8fafc8ee60fa733eb4024 100644 (file)
--- 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 38271b543a928572bc0c9f9fa1e7c32806097367..8c5b1fef280ffd5816df81050a7a3fe9b108f7d8 100644 (file)
--- 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 9eb563e60cd460463d16da361d8685b3040e861d..5d61952041c71fc52409271a47981454fc59778d 100644 (file)
--- 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 c4e3712b9f4b1e065bcb2ef94a8874ff747ec4c3..0a0689c171550973b6f9257e64383430fd6ee63f 100644 (file)
--- 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 bea30ecb1a07acfba323fd6b3f889c7054834059..8728456aca456cdf05b0230e63988cca32d58f61 100644 (file)
--- 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 fc8ce1a1bb4184aed354689abefc5505db99a0f1..877b87b67276d7ff587efbb836981d32f32ced54 100644 (file)
--- 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 19425535e890c63c16b43b31229268a6d4e0c7ae..41f2338f3315ecac4b9075afd9a7de2cdee64dc1 100644 (file)
--- 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 9864d64e3b17da37a448d703f279b71224fadf2c..34c1a55d6e12355a85fe251e8f0b305adf6b787c 100644 (file)
--- 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 f963b03294924003eac52630bd3becb6f3b09a63..861dc46ef700ed90e811c59f6c3c2f9744092db3 100644 (file)
--- 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 e3833362f81fbf8d2ea403b82bd2e7fcfbad46ca..523569d84e999d16ef41889ae44a8ff9a456fd20 100644 (file)
--- 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 6d37af514c3a57e4183cfc95b2424d998284bd74..394c74026755f982410aa71a9a788b666ba911af 100644 (file)
--- 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 e4cb3dd63bcd8c4cf8ff98e9a5dc82462af2da6d..d3a5a7e63749077dbc2e323504488781d4557ed0 100644 (file)
--- 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 b6e455b57f539b63170a7ccad7c62a0bf63cef7a..ad215ee33a2a6a64db14bb08784de73ff131cd98 100644 (file)
--- 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 33b3308b7244344a44622a0d9be7e25821befb98..8f3bab428ad43438cb3fbabd03531f0e9a838e22 100644 (file)
--- 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 c1de9d0d0b239eba8a5690942e179fc2207f28f0..ad3d9e12b4486c747397f19553969a50588ba979 100644 (file)
--- 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 bd55854e29434510b59846288387781ba45afa48..c27848219f0f5d077d4a4634a5c1c529f0a430d9 100644 (file)
--- 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 56cd4937ceb4bda6516ed077b15b73e8a30fb2cd..53b03e7888e3d21d7bd94c6f8b340027a5c98a91 100644 (file)
--- 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 (file)
index 0000000..0e647b9
--- /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 b538f5b93358d21f60c829b6c2b30290d8b88fa4..c226325704ea7244f77bef9c814f1fcc761b6131 100755 (executable)
--- 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 5d2ae5b990a3a1b6cdddebd4ec9a4895df5e6c42..58f6ab3d313b92867dce8993243d25fc01aca007 100644 (file)
--- 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 f6b1e639b1b3938147650bba433fddf366e6d19a..46781a256ba42eb5904717942f423443c2affa5e 100644 (file)
--- 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 f9ebf246b9f52dcc30249b93c18c22a314d895d7..12a890ff1ea78d63f61c9a64631d6e15c424a435 100644 (file)
--- 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 594ad9ecbeb03f232f816dd8762919aab65529b0..fdbaef1fddc5f220ca89684dc48a7956861cdf83 100644 (file)
--- 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 a9b2a63f8183e700e1d3ff6da6853b864a1b9f21..e28ce3af871c648d9b5648fda2427157ca13e5ef 100644 (file)
--- 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 618aeb484044573fc2a0ae6188fac709573ff388..b274374033251cbb4e9fed0553d7ec40dffa399c 100755 (executable)
--- 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 f3bf040bcb1e56db528db81de7fd8a8ac629fab3..9a91a6fe20415211cbd4b95bd9259edbdea4a66d 100644 (file)
--- 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