Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compilation with MinGW32 #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −16
Open

Fix compilation with MinGW32 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ function findlibs()
else
links { "SDL2" }
end
filter { "platforms:win-amd64-gl3" }
filter { "platforms:win-amd64-gl3", "action:vs*" }
libdirs { path.join(_OPTIONS["glfwdir64"], "lib-vc2015") }
libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x64") }
filter { "platforms:win-x86-gl3" }
filter { "platforms:win-x86-gl3", "action:vs*" }
libdirs { path.join(_OPTIONS["glfwdir32"], "lib-vc2015") }
libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x86") }
filter { "platforms:win*gl3" }
Expand All @@ -149,8 +149,6 @@ function findlibs()
end
filter { "platforms:*d3d9" }
links { "gdi32", "d3d9" }
filter { "platforms:*d3d9", "action:vs*" }
links { "Xinput9_1_0" }
filter {}
end

Expand Down
8 changes: 5 additions & 3 deletions skeleton/imgui/ImGuizmo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
#endif
#include "imgui_internal.h"
#include "ImGuizmo.h"
#if !defined(_WIN32)

#if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h>
#endif
#if !defined(_MSC_VER) && !defined(__MINGW64_VERSION_MAJOR)
#define _malloca(x) alloca(x)
#define _freea(x)
#else
#include <malloc.h>
#endif

// includes patches for multiview from
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ elseif(LIBRW_PLATFORM_D3D9)
target_link_libraries(librw
PRIVATE
d3d9
xinput
)
endif()

Expand Down
12 changes: 4 additions & 8 deletions src/d3d/rwd3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#ifdef RW_D3D9
#ifdef WITH_D3D
#include <d3d9.h>
#else
typedef struct IDirect3DDevice9 IDirect3DDevice9;
#endif
#endif

namespace rw {

#ifdef RW_D3D9

#ifdef _WINDOWS_
#if defined(_WINDOWS_) || defined(_WINDEF_H)
struct EngineOpenParams
{
HWND window;
Expand All @@ -19,10 +21,7 @@ struct EngineOpenParams
uint32 please_include_windows_h;
};
#endif
#else
#ifdef _D3D9_H_
#error "please don't include d3d9.h for non-d3d9 platforms"
#endif

#endif

namespace d3d {
Expand All @@ -32,10 +31,7 @@ extern bool32 isP8supported;
extern Device renderdevice;

#ifdef RW_D3D9
#ifdef _D3D9_H_
extern IDirect3DDevice9 *d3ddevice;
void setD3dMaterial(D3DMATERIAL9 *mat9);
#endif

#define COLOR_ARGB(a, r, g, b) ((rw::uint32)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))

Expand Down