Skip to content

Commit 6b382b3

Browse files
authored
Merge pull request #11 from Wires77/linux-wine-dll-fix
Fixes issue with Wine's implementation of CreateWindow...by removing that call
2 parents 75c0a5d + 3d8833c commit 6b382b3

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
with:
1010
submodules: 'recursive'
1111
- name: run-vcpkg
12-
uses: lukka/run-vcpkg@v3.2
12+
uses: lukka/run-vcpkg@v6.0
1313
with:
1414
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
1515
vcpkgArguments: '@${{ github.workspace }}/vcpkg.txt'
1616
cleanAfterBuild: false
1717
- name: Setup MSBuild
18-
uses: microsoft/setup-msbuild@v1.0.0
18+
uses: microsoft/setup-msbuild@v1
1919
- name: Check dependencies
2020
run: 'ls ${{ github.workspace }}/vcpkg/installed/x86-windows-static'
2121
- name: Build DLL

SimpleGraphic.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@
112112
<PrecompiledHeader>NotUsing</PrecompiledHeader>
113113
<PrecompiledHeaderFile>
114114
</PrecompiledHeaderFile>
115-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)vcpkg\installed\x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)vcpkg\installed\x86-windows-static\include;%(AdditionalLibraryDirectories)LuaJIT/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116116
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
117117
</ClCompile>
118118
<Link>
119119
<SubSystem>Windows</SubSystem>
120120
<GenerateDebugInformation>true</GenerateDebugInformation>
121121
<EnableUAC>false</EnableUAC>
122-
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
122+
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)LuaJIT/src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
123123
<AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;tiff.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
124124
</Link>
125125
</ItemDefinitionGroup>

engine/system/win/sys_video.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,16 @@ sys_video_c::sys_video_c(sys_IMain* sysHnd)
8989
if (RegisterClass(&wndClass) == 0) {
9090
sys->Error("Unable to register main window class");
9191
}
92-
9392
// Create the window
9493
hwnd = CreateWindowEx(
95-
0, CFG_TITLE " Class", CFG_TITLE, WS_POPUP | WS_VISIBLE,/* | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX | WS_MAXIMIZEBOX, */
94+
0, CFG_TITLE " Class", CFG_TITLE, WS_POPUP,/* | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX | WS_MAXIMIZEBOX, */
9695
0, 0, 500, 500,
9796
NULL, NULL, sys->hinst, NULL
9897
);
9998
if (hwnd == NULL) {
10099
sys->Error("Unable to create window");
101100
}
102101
SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)sys);
103-
ShowWindow(hwnd, SW_HIDE);
104-
105102
// Process any messages generated during creation
106103
sys->RunMessages();
107104
}

0 commit comments

Comments
 (0)