From bb8420832bb8343f8c32d148541a04cf7f50f795 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 10 Aug 2013 01:07:18 +0000 Subject: [PATCH] more mupen vcproj cleanup --- .../mupen64plus-audio-bkm/mupen64plus-audio-bkm.vcxproj | 1 + .../projects/msvc11/mupen64plus-audio-sdl.vcxproj | 1 + .../projects/msvc11/mupen64plus-core.vcxproj | 5 +++-- .../mupen64plus-input-bkm/mupen64plus-input-bkm.vcxproj | 1 + .../projects/msvc11/mupen64plus-input-sdl.vcxproj | 1 + .../projects/msvc11/mupen64plus-rsp-hle.vcxproj | 1 + .../projects/msvc11/mupen64plus-ui-console.vcxproj | 3 ++- libmupen64plus/mupen64plus-ui-console/src/main.c | 7 +++++++ .../projects/msvc11/mupen64plus-video-glide64mk2.vcxproj | 1 + .../projects/msvc11/mupen64plus-video-rice.vcxproj | 1 + 10 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libmupen64plus/mupen64plus-audio-bkm/mupen64plus-audio-bkm/mupen64plus-audio-bkm.vcxproj b/libmupen64plus/mupen64plus-audio-bkm/mupen64plus-audio-bkm/mupen64plus-audio-bkm.vcxproj index 5c0537ba5b..3e4b9e1b00 100644 --- a/libmupen64plus/mupen64plus-audio-bkm/mupen64plus-audio-bkm/mupen64plus-audio-bkm.vcxproj +++ b/libmupen64plus/mupen64plus-audio-bkm/mupen64plus-audio-bkm/mupen64plus-audio-bkm.vcxproj @@ -63,6 +63,7 @@ ..\..\mupen64plus-core\src\api;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true true diff --git a/libmupen64plus/mupen64plus-audio-sdl/projects/msvc11/mupen64plus-audio-sdl.vcxproj b/libmupen64plus/mupen64plus-audio-sdl/projects/msvc11/mupen64plus-audio-sdl.vcxproj index 885155ace3..34e2b2b744 100644 --- a/libmupen64plus/mupen64plus-audio-sdl/projects/msvc11/mupen64plus-audio-sdl.vcxproj +++ b/libmupen64plus/mupen64plus-audio-sdl/projects/msvc11/mupen64plus-audio-sdl.vcxproj @@ -85,6 +85,7 @@ Level3 ProgramDatabase Default + true ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;%(AdditionalDependencies) diff --git a/libmupen64plus/mupen64plus-core/projects/msvc11/mupen64plus-core.vcxproj b/libmupen64plus/mupen64plus-core/projects/msvc11/mupen64plus-core.vcxproj index 5b109e5a48..3eb02ee037 100644 --- a/libmupen64plus/mupen64plus-core/projects/msvc11/mupen64plus-core.vcxproj +++ b/libmupen64plus/mupen64plus-core/projects/msvc11/mupen64plus-core.vcxproj @@ -74,7 +74,7 @@ true - shell32.lib;opengl32.lib;glu32.lib;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\lib\zlib.lib;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\lib\libpng.lib;..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\lib\freetype.lib;%(AdditionalDependencies) + winmm.lib;shell32.lib;opengl32.lib;glu32.lib;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\lib\zlib.lib;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\lib\libpng.lib;..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\lib\freetype.lib;%(AdditionalDependencies) $(OutDir)mupen64plus.dll true Windows @@ -94,9 +94,10 @@ Level3 ProgramDatabase Default + true - shell32.lib;opengl32.lib;glu32.lib;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\lib\zlib.lib;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\lib\libpng.lib;..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\lib\freetype.lib;%(AdditionalDependencies) + winmm.lib;shell32.lib;opengl32.lib;glu32.lib;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\lib\zlib.lib;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\lib\libpng.lib;..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\lib\freetype.lib;%(AdditionalDependencies) $(OutDir)mupen64plus.dll true Windows diff --git a/libmupen64plus/mupen64plus-input-bkm/mupen64plus-input-bkm/mupen64plus-input-bkm.vcxproj b/libmupen64plus/mupen64plus-input-bkm/mupen64plus-input-bkm/mupen64plus-input-bkm.vcxproj index c273ddc6e3..d7280ff45e 100644 --- a/libmupen64plus/mupen64plus-input-bkm/mupen64plus-input-bkm/mupen64plus-input-bkm.vcxproj +++ b/libmupen64plus/mupen64plus-input-bkm/mupen64plus-input-bkm/mupen64plus-input-bkm.vcxproj @@ -62,6 +62,7 @@ ..\..\mupen64plus-core\src\api;..\..\mupen64plus-win32-deps\SDL-1.2.14\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true true diff --git a/libmupen64plus/mupen64plus-input-sdl/projects/msvc11/mupen64plus-input-sdl.vcxproj b/libmupen64plus/mupen64plus-input-sdl/projects/msvc11/mupen64plus-input-sdl.vcxproj index 74f8ee7303..6842ddc262 100644 --- a/libmupen64plus/mupen64plus-input-sdl/projects/msvc11/mupen64plus-input-sdl.vcxproj +++ b/libmupen64plus/mupen64plus-input-sdl/projects/msvc11/mupen64plus-input-sdl.vcxproj @@ -84,6 +84,7 @@ Level3 ProgramDatabase Default + true ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;%(AdditionalDependencies) diff --git a/libmupen64plus/mupen64plus-rsp-hle/projects/msvc11/mupen64plus-rsp-hle.vcxproj b/libmupen64plus/mupen64plus-rsp-hle/projects/msvc11/mupen64plus-rsp-hle.vcxproj index 95173f7e87..b4cc84cb41 100644 --- a/libmupen64plus/mupen64plus-rsp-hle/projects/msvc11/mupen64plus-rsp-hle.vcxproj +++ b/libmupen64plus/mupen64plus-rsp-hle/projects/msvc11/mupen64plus-rsp-hle.vcxproj @@ -86,6 +86,7 @@ Level3 ProgramDatabase Default + true true diff --git a/libmupen64plus/mupen64plus-ui-console/projects/msvc11/mupen64plus-ui-console.vcxproj b/libmupen64plus/mupen64plus-ui-console/projects/msvc11/mupen64plus-ui-console.vcxproj index 91a8c19453..62fcf8e747 100644 --- a/libmupen64plus/mupen64plus-ui-console/projects/msvc11/mupen64plus-ui-console.vcxproj +++ b/libmupen64plus/mupen64plus-ui-console/projects/msvc11/mupen64plus-ui-console.vcxproj @@ -66,7 +66,7 @@ true - ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDLmain.lib;%(AdditionalDependencies) + ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDLmain.lib;%(AdditionalDependencies) true Console MachineX86 @@ -93,6 +93,7 @@ copy ..\..\..\mupen64plus-win32-deps\zlib-1.2.3\bin\*.dll "$(OutDir)" Level3 ProgramDatabase CompileAsCpp + true ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDLmain.lib;%(AdditionalDependencies) diff --git a/libmupen64plus/mupen64plus-ui-console/src/main.c b/libmupen64plus/mupen64plus-ui-console/src/main.c index c7f20e23a3..d0e0b32a2e 100644 --- a/libmupen64plus/mupen64plus-ui-console/src/main.c +++ b/libmupen64plus/mupen64plus-ui-console/src/main.c @@ -30,6 +30,13 @@ #include #include +void* mumalloc(size_t amt) +{ + if(amt/1024 != 0) + printf("malloc of %d KB\n",amt/1024); + return malloc(amt); +} + // The mac version of SDL requires inclusion of SDL_main in the executable #ifdef __APPLE__ #include diff --git a/libmupen64plus/mupen64plus-video-glide64mk2/projects/msvc11/mupen64plus-video-glide64mk2.vcxproj b/libmupen64plus/mupen64plus-video-glide64mk2/projects/msvc11/mupen64plus-video-glide64mk2.vcxproj index 00e98c9f40..73fa255aeb 100644 --- a/libmupen64plus/mupen64plus-video-glide64mk2/projects/msvc11/mupen64plus-video-glide64mk2.vcxproj +++ b/libmupen64plus/mupen64plus-video-glide64mk2/projects/msvc11/mupen64plus-video-glide64mk2.vcxproj @@ -130,6 +130,7 @@ .\Release/ Level3 true + true NDEBUG;%(PreprocessorDefinitions) diff --git a/libmupen64plus/mupen64plus-video-rice/projects/msvc11/mupen64plus-video-rice.vcxproj b/libmupen64plus/mupen64plus-video-rice/projects/msvc11/mupen64plus-video-rice.vcxproj index cf0f8bfbce..f678d3033e 100644 --- a/libmupen64plus/mupen64plus-video-rice/projects/msvc11/mupen64plus-video-rice.vcxproj +++ b/libmupen64plus/mupen64plus-video-rice/projects/msvc11/mupen64plus-video-rice.vcxproj @@ -86,6 +86,7 @@ Level3 ProgramDatabase Default + true user32.lib;gdi32.lib;opengl32.lib;glu32.lib;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\lib\libpng.lib;%(AdditionalDependencies)