diff --git a/README.md b/README.md index dd32594..b4bb268 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ This unofficial project is a migration of [D Forms Library (DFL)](http://wiki.dp DFL is a Win32 windowing library for the D language. ## Recent major features +- **Windows OMF support has been removed (for DMD v2.109.0).** - **Registered DFL to DUB.** -- **Support multiple screens.** +- Supported multiple screens. - Module "dfl.chart" is now comming. - TableRenderer (with example) - LineGraphRenderer (with example) @@ -76,11 +77,11 @@ set dmc_path=c:\dmc\dm ### 2. Install the undeaD library DFL is required the undeaD library (**undead.lib**). Download a ZIP file from https://github.com/dlang/undead. -Extract **undeaD-master.zip** and run the below with either option `-a=x86_omf`, `-a=x86_32mscoff` or `-a=x86_64`: +Extract **undeaD-master.zip** and run the below with either option `-a=x86_mscoff` or `-a=x86_64`: ```bat > cd undeaD-master -> dub build -a=x86_omf - Starting Performing "debug" build using C:\D\dmd2\windows\bin\dmd.exe for x86, x86_omf. +> dub build -a=x86_64 + Starting Performing "debug" build using C:\D\dmd2\windows\bin\dmd.exe for x86_64. Up-to-date undead ~master: target for configuration [library] is up to date. > dir bin /b undead.lib @@ -88,13 +89,9 @@ undead.lib Copy the **undead.lib** to `your/lib/dir`. ### 3. Make dfl.lib and dfl_debug.lib -Run **makelib.bat**: +Run **makelib.bat** (MSVC required): ```bat > cd dfl/win32/dfl -> makelib.bat 32omf # 32-bit omf -``` -or (MSVC required) -```bat > makelib.bat # 32-bit mscoff ``` or (MSVC required) @@ -105,12 +102,11 @@ or (MSVC required) ```bat > makelib.bat 64 # 64-bit mscoff ``` -Also copy **dfl.lib** and **dfl_debug.lib** to `your/lib/dir`. +Also copy **dfl.lib** and **dfl_debug.lib** in `dfl/source` to `your/lib/dir`. **IMPORTANT**: Both library files are containing the **undead.lib** and WINSDK libraries such as **user32.lib**, **gdi32.lib** and so on. In order to make and move *.lib to paths below: -- **go32omf.bat** : Make and move *.lib to `%dmd_path%\lib` - **go.bat** (MSVC required) : Make and move *.lib to `%dmd_path%\lib32mscoff` - **go.bat 32mscoff** (MSVC required) : ditto - **go64.bat** (MSVC required) : Make and move *.lib to `%dmd_path%\lib64` diff --git a/examples/hello_dfl/build.bat b/examples/hello_dfl/build.bat deleted file mode 100644 index 7673187..0000000 --- a/examples/hello_dfl/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -pushd source -dmd -m32omf -L/exet:nt/su:windows:4.0 hello_dfl.d -hello_dfl.exe -popd diff --git a/go.bat b/go.bat index 03938dd..61c2790 100644 --- a/go.bat +++ b/go.bat @@ -1,7 +1,6 @@ @rem How to use: @rem go.bat # Same as 32mscoff @rem go.bat 32mscoff # 32-Bit COFF -@rem go.bat 32omf # 32-bit OMF @rem go.bat 64 # 64-Bit call makelib "%~1" diff --git a/go32omf.bat.lnk b/go32omf.bat.lnk deleted file mode 100644 index d7213b8..0000000 Binary files a/go32omf.bat.lnk and /dev/null differ diff --git a/lib/windows-x86_omf/COMCTL32.LIB b/lib/windows-x86_omf/COMCTL32.LIB deleted file mode 100644 index 3d65984..0000000 Binary files a/lib/windows-x86_omf/COMCTL32.LIB and /dev/null differ diff --git a/lib/windows-x86_omf/OLEAUT32.LIB b/lib/windows-x86_omf/OLEAUT32.LIB deleted file mode 100644 index 91169bc..0000000 Binary files a/lib/windows-x86_omf/OLEAUT32.LIB and /dev/null differ diff --git a/lib/windows-x86_omf/README.txt b/lib/windows-x86_omf/README.txt deleted file mode 100644 index 38eda81..0000000 --- a/lib/windows-x86_omf/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -Windows SDK Libraries from \dmd2\windows\lib -advapi32.lib -COMCTL32.LIB -comdlg32.lib -gdi32.lib -ole32.lib -OLEAUT32.LIB -shell32.lib -user32.lib -WS2_32.LIB diff --git a/lib/windows-x86_omf/WS2_32.LIB b/lib/windows-x86_omf/WS2_32.LIB deleted file mode 100644 index efc2a63..0000000 Binary files a/lib/windows-x86_omf/WS2_32.LIB and /dev/null differ diff --git a/lib/windows-x86_omf/advapi32.lib b/lib/windows-x86_omf/advapi32.lib deleted file mode 100644 index d18761b..0000000 Binary files a/lib/windows-x86_omf/advapi32.lib and /dev/null differ diff --git a/lib/windows-x86_omf/comdlg32.lib b/lib/windows-x86_omf/comdlg32.lib deleted file mode 100644 index 82b53b9..0000000 Binary files a/lib/windows-x86_omf/comdlg32.lib and /dev/null differ diff --git a/lib/windows-x86_omf/gdi32.lib b/lib/windows-x86_omf/gdi32.lib deleted file mode 100644 index 667f11d..0000000 Binary files a/lib/windows-x86_omf/gdi32.lib and /dev/null differ diff --git a/lib/windows-x86_omf/ole32.lib b/lib/windows-x86_omf/ole32.lib deleted file mode 100644 index c0ab1cc..0000000 Binary files a/lib/windows-x86_omf/ole32.lib and /dev/null differ diff --git a/lib/windows-x86_omf/shell32.lib b/lib/windows-x86_omf/shell32.lib deleted file mode 100644 index 8fffc1a..0000000 Binary files a/lib/windows-x86_omf/shell32.lib and /dev/null differ diff --git a/lib/windows-x86_omf/user32.lib b/lib/windows-x86_omf/user32.lib deleted file mode 100644 index fdafc35..0000000 Binary files a/lib/windows-x86_omf/user32.lib and /dev/null differ diff --git a/makecoff.bat b/makecoff.bat index 06f445a..d2b024f 100644 --- a/makecoff.bat +++ b/makecoff.bat @@ -1,5 +1,5 @@ @rem Make DFL. -@rem http://www.dprogramming.com/dfl.php +@rem https://github.com/Rayerd/dfl @rem Modified for 64-bit and COFF object format @rem How to use: diff --git a/makelib.bat b/makelib.bat index 40a6459..34a076c 100644 --- a/makelib.bat +++ b/makelib.bat @@ -1,5 +1,5 @@ @rem Make DFL. -@rem http://www.dprogramming.com/dfl.php +@rem https://github.com/Rayerd/dfl @rem Requires DMD and DMC's libs @rem Free downloads from https://dlang.org/download.html @@ -7,7 +7,6 @@ @rem How to use: @rem makelib.bat # Same as 32mscoff @rem makelib.bat 32mscoff # 32-Bit COFF -@rem makelib.bat 32omf # 32-bit OMF @rem makelib.bat 64 # 64-Bit @if "%~1" == "64" ( @@ -23,7 +22,9 @@ goto done ) @if "%~1" == "32omf" ( - set dmd_omf_flag=-m32omf + @echo. + @echo '32omf' is already invalid option. + goto done ) else ( set dmd_omf_flag= ) diff --git a/makelibtango.bat b/makelibtango.bat deleted file mode 100644 index 8c70316..0000000 --- a/makelibtango.bat +++ /dev/null @@ -1,11 +0,0 @@ -@goto done - -@set _dlib_save89824=%dlib% -@set dlib=Tango - -@call makelib.bat - -@set dlib=%_dlib_save89824% - -:done -@echo Now, DFL with Tango library is not work.