diff options
| author |  Sebastian Valle | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-11 14:44:21 -0500 |
| commit | 2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/common/timer.cpp | |
| parent | Merge pull request #2154 from mailwl/apt-getstartupargument (diff) | |
| parent | gdbstub: Remove unused include (diff) | |
| download | yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.gz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.xz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.zip | |
Merge pull request #2267 from JayFoxRox/fix-mingw-cc
Support mingw cross-compilation
Diffstat (limited to 'src/common/timer.cpp')
| -rw-r--r-- | src/common/timer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/timer.cpp b/src/common/timer.cpp index e843cbd9c..c9803109e 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp | |||
| @@ -4,7 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #include <time.h> | 5 | #include <time.h> |
| 6 | #ifdef _WIN32 | 6 | #ifdef _WIN32 |
| 7 | #include <Windows.h> | 7 | #include <windows.h> |
| 8 | // windows.h needs to be included before other windows headers | ||
| 8 | #include <mmsystem.h> | 9 | #include <mmsystem.h> |
| 9 | #include <sys/timeb.h> | 10 | #include <sys/timeb.h> |
| 10 | #else | 11 | #else |