From 1f734a69a0cd6a6445e659d49e590810ab6806dc Mon Sep 17 00:00:00 2001 From: Tom Burnett Date: Sun, 12 Oct 2014 01:40:40 -0700 Subject: [PATCH] Small VS2013 fixes --- plugins/GSdx/GSDeviceOGL.cpp | 2 +- plugins/dev9ghzdrk/Win32/postBuild.cmd | 49 ++++++++++++++++++++++ plugins/dev9ghzdrk/Win32/postBuild.inc.cmd | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 plugins/dev9ghzdrk/Win32/postBuild.cmd create mode 100644 plugins/dev9ghzdrk/Win32/postBuild.inc.cmd diff --git a/plugins/GSdx/GSDeviceOGL.cpp b/plugins/GSdx/GSDeviceOGL.cpp index 2e9126ec37..ffbbc06618 100644 --- a/plugins/GSdx/GSDeviceOGL.cpp +++ b/plugins/GSdx/GSDeviceOGL.cpp @@ -172,7 +172,7 @@ bool GSDeviceOGL::Create(GSWnd* wnd) // **************************************************************** #ifndef ENABLE_GLES #ifdef ENABLE_OGL_DEBUG - gl_DebugMessageCallback(DebugOutputToFile, NULL); + gl_DebugMessageCallback((GLDEBUGPROC)DebugOutputToFile, NULL); glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB); #endif #endif diff --git a/plugins/dev9ghzdrk/Win32/postBuild.cmd b/plugins/dev9ghzdrk/Win32/postBuild.cmd new file mode 100644 index 0000000000..6ac7841887 --- /dev/null +++ b/plugins/dev9ghzdrk/Win32/postBuild.cmd @@ -0,0 +1,49 @@ +::@echo off +:: +:: Usage: postBuild.cmd SourcePath DestFile DestExt {plugins} +:: +:: SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +:: DestFile - Base filename of the target/dest, without extension! +:: DestExt - Extension of the target/dest! +:: plugins - optional parameter used to generate plugins into the /plugins folder +:: +:: The destination file is determined by the PCSX2_TARGET_DIR environment var. + +SETLOCAL ENABLEEXTENSIONS +if defined PCSX2_TARGET_COPY CALL :TestAndCopy "%PCSX2_TARGET_COPY%" %1 %2 %3 %4 +ENDLOCAL +exit 0 + +if exists postBuild.inc.cmd call postBuild.inc.cmd + +:TestAndCopy +:: Subroutine. First parameter is our Target Dir. Since it's a parameter into +:: the subroutine, we can use tilda expansion to handle quotes correctly. :) + +if NOT EXIST "%~1" ( + md "%~1" +) + +:: Error checking. Try to change to the dir. If it fails, it means the dir is +:: actually a file, and we should cancel the script. + +set mycwd="%CD%" +cd "%~1" +if %ERRORLEVEL% NEQ 0 goto :eof +cd %mycwd% + +set pcsxoutdir=%~1\%~5 +set pcsxoutname=%pcsxoutdir%\%~3%4 + +IF NOT EXIST "%pcsxoutdir%" ( + md "%pcsxoutdir%" +) + +copy /Y "%~2" "%pcsxoutname%" +if %ERRORLEVEL% EQU 0 ( + echo Target copied to %pcsxoutname% +) + +goto :eof + +:quit diff --git a/plugins/dev9ghzdrk/Win32/postBuild.inc.cmd b/plugins/dev9ghzdrk/Win32/postBuild.inc.cmd new file mode 100644 index 0000000000..6c6ad5c8f9 --- /dev/null +++ b/plugins/dev9ghzdrk/Win32/postBuild.inc.cmd @@ -0,0 +1 @@ +set SVN_REV=20141004113334