From c5097876e57421b528b6062f4065a8fcb3d31f80 Mon Sep 17 00:00:00 2001 From: firleju Date: Fri, 29 Sep 2017 21:37:48 +0200 Subject: [PATCH] cleaning build system and ref --- EU07.cpp | 18 +++++++++--------- ref/libpng/lib/{win64 => x64}/libpng16.lib | Bin ref/libpng/lib/{win32 => x86}/libpng16.lib | Bin .../lib/{win64 => x64}/libsndfile-1.lib | Bin .../lib/{win32 => x86}/libsndfile-1.lib | Bin ref/luajit/lib/{win64 => x64}/lua51.lib | Bin ref/luajit/lib/{win32 => x86}/lua51.lib | Bin ref/openal/lib/{win64 => x64}/OpenAL32.lib | Bin ref/openal/lib/{win32 => x86}/OpenAL32.lib | Bin 9 files changed, 9 insertions(+), 9 deletions(-) rename ref/libpng/lib/{win64 => x64}/libpng16.lib (100%) rename ref/libpng/lib/{win32 => x86}/libpng16.lib (100%) rename ref/libsndfile/lib/{win64 => x64}/libsndfile-1.lib (100%) rename ref/libsndfile/lib/{win32 => x86}/libsndfile-1.lib (100%) rename ref/luajit/lib/{win64 => x64}/lua51.lib (100%) rename ref/luajit/lib/{win32 => x86}/lua51.lib (100%) rename ref/openal/lib/{win64 => x64}/OpenAL32.lib (100%) rename ref/openal/lib/{win32 => x86}/OpenAL32.lib (100%) diff --git a/EU07.cpp b/EU07.cpp index 133b577f..1573a1ed 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -337,15 +337,15 @@ int main(int argc, char *argv[]) // switch off the topmost flag ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); - const HANDLE icon = ::LoadImage( - ::GetModuleHandle( 0 ), - MAKEINTRESOURCE( IDI_ICON1 ), - IMAGE_ICON, - ::GetSystemMetrics( SM_CXSMICON ), - ::GetSystemMetrics( SM_CYSMICON ), - 0 ); - if( icon ) - ::SendMessage( Hwnd, WM_SETICON, ICON_SMALL, reinterpret_cast( icon ) ); + //const HANDLE icon = ::LoadImage( + // ::GetModuleHandle( 0 ), + // MAKEINTRESOURCE( IDI_ICON1 ), + // IMAGE_ICON, + // ::GetSystemMetrics( SM_CXSMICON ), + // ::GetSystemMetrics( SM_CYSMICON ), + // 0 ); + //if( icon ) + // ::SendMessage( Hwnd, WM_SETICON, ICON_SMALL, reinterpret_cast( icon ) ); #endif try { diff --git a/ref/libpng/lib/win64/libpng16.lib b/ref/libpng/lib/x64/libpng16.lib similarity index 100% rename from ref/libpng/lib/win64/libpng16.lib rename to ref/libpng/lib/x64/libpng16.lib diff --git a/ref/libpng/lib/win32/libpng16.lib b/ref/libpng/lib/x86/libpng16.lib similarity index 100% rename from ref/libpng/lib/win32/libpng16.lib rename to ref/libpng/lib/x86/libpng16.lib diff --git a/ref/libsndfile/lib/win64/libsndfile-1.lib b/ref/libsndfile/lib/x64/libsndfile-1.lib similarity index 100% rename from ref/libsndfile/lib/win64/libsndfile-1.lib rename to ref/libsndfile/lib/x64/libsndfile-1.lib diff --git a/ref/libsndfile/lib/win32/libsndfile-1.lib b/ref/libsndfile/lib/x86/libsndfile-1.lib similarity index 100% rename from ref/libsndfile/lib/win32/libsndfile-1.lib rename to ref/libsndfile/lib/x86/libsndfile-1.lib diff --git a/ref/luajit/lib/win64/lua51.lib b/ref/luajit/lib/x64/lua51.lib similarity index 100% rename from ref/luajit/lib/win64/lua51.lib rename to ref/luajit/lib/x64/lua51.lib diff --git a/ref/luajit/lib/win32/lua51.lib b/ref/luajit/lib/x86/lua51.lib similarity index 100% rename from ref/luajit/lib/win32/lua51.lib rename to ref/luajit/lib/x86/lua51.lib diff --git a/ref/openal/lib/win64/OpenAL32.lib b/ref/openal/lib/x64/OpenAL32.lib similarity index 100% rename from ref/openal/lib/win64/OpenAL32.lib rename to ref/openal/lib/x64/OpenAL32.lib diff --git a/ref/openal/lib/win32/OpenAL32.lib b/ref/openal/lib/x86/OpenAL32.lib similarity index 100% rename from ref/openal/lib/win32/OpenAL32.lib rename to ref/openal/lib/x86/OpenAL32.lib