Skip to content

Commit

Permalink
wine: Squash commits and remove /opt library support
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreRH committed Jan 21, 2024
1 parent f00a42d commit 10ae354
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ $ HODLL=fexcore.dll wine your_x86_application.exe
$ HODLL=libwow64fex.dll wine your_x86_application.exe
```

### 8) Todo
### 8) Known issues

* Get more applications running
* QEMU: Investigate CriticalSection issues (just timing?)
* QEMU: CriticalSection doesn't work reliably and other instabilities
* FEX, PE: Doesn't support CLI applications, as it can't handle writing to the console
* FEX, Unix: Performance/Stability issues compared to the PE variant

### 9) Financial Contributors

Expand Down
10 changes: 3 additions & 7 deletions docs/COMPILE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $ git submodule update --init --recursive
```
And note while Box64 is already integrated as DLL, you can build other emulators (currently FEX and QEMU), but you don't need to, one is enough depending on your use-case.

#### Wine (including Box64)
#### Wine (includes Box64)
To build Hangover Wine you need:

- The dependencies to [build](https://wiki.winehq.org/Building_Wine#Satisfying_Build_Dependencies) a 64 bit Wine
Expand Down Expand Up @@ -51,9 +51,7 @@ $ make -j$(nproc)

In case the compiler complains about something in linux-user/ioctls.h remove the corresponding line and run make again.

Place resulting libraries (build/libqemu-arm.so and/or build/libqemu-i386.so) in your library path (e.g /usr/lib) or set HOLIB to the full path of the resulting library.

Depreciation note: Placing the libraries under /opt will still work, but is deprecated. Until it is removed the load order is HOLIB, library path, /opt.
Place resulting libraries (build/libqemu-arm.so and/or build/libqemu-i386.so) in your library path (e.g /usr/lib) or set HOLIB to the full path of the resulting library. (HOLIB takes precedence)

#### FEX, Unix (optional)
To build FEXCore from FEX you need:
Expand All @@ -69,9 +67,7 @@ $ CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_LTO=True
$ make -j$(nproc) FEXCore_shared
```

Place resulting library (build_unix/FEXCore/Source/libFEXCore.so) in your library path (e.g /usr/lib) or set HOLIB to the full path of the resulting library.

Depreciation note: Placing the libraries under /opt will still work, but is deprecated. Until it is removed the load order is HOLIB, library path, /opt.
Place resulting library (build_unix/FEXCore/Source/libFEXCore.so) in your library path (e.g /usr/lib) or set HOLIB to the full path of the resulting library. (HOLIB takes precedence)

#### FEX, PE (optional)
To build wow64fex from FEX you need:
Expand Down
2 changes: 1 addition & 1 deletion wine

0 comments on commit 10ae354

Please sign in to comment.