From fe347e4339e25607c4f35ca4892ef9f4b4211108 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Tue, 26 Apr 2011 13:31:13 -0400 Subject: TOOLS: Add ole32.lib and uuid.lib to Code::Blocks linked libraries --- devtools/create_project/create_project.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'devtools/create_project') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 29bc5bfcd5..aafbe7585b 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -364,6 +364,11 @@ int main(int argc, char *argv[]) { provider = new CreateProjectTool::CodeBlocksProvider(globalWarnings, projectWarnings); + + // Those libraries are automatically added by MSVC, but we need to add them manually with mingw + setup.libraries.push_back("ole32"); + setup.libraries.push_back("uuid"); + break; case kProjectMSVC: -- cgit v1.2.3 From c3d9c6afa57055705849359deaac7c5748d66fe1 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Fri, 1 Apr 2011 01:30:12 -0400 Subject: BACKENDS: Add use flag for taskbar integration --- devtools/create_project/create_project.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools/create_project') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index aafbe7585b..35d08561bf 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -779,6 +779,7 @@ const Feature s_features[] = { { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. { "opengl", "USE_OPENGL", "opengl32", true, "OpenGL support" }, + { "taskbar", "USE_TASKBAR", "", true, "Taskbar integration support" }, { "translation", "USE_TRANSLATION", "", true, "Translation support" }, { "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"}, { "langdetect", "USE_DETECTLANG", "", true, "System language detection support" } // This feature actually depends on "translation", there -- cgit v1.2.3 From 00e3f920d01be56b5882f721a3eaf40ea6210f44 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Fri, 1 Jul 2011 01:16:35 -0400 Subject: CREATE_PROJECT: Update with new location of NSIS script and updated parameters --- devtools/create_project/scripts/installer.vbs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs index d752355acd..19b4eee49b 100644 --- a/devtools/create_project/scripts/installer.vbs +++ b/devtools/create_project/scripts/installer.vbs @@ -72,10 +72,9 @@ Sub CreateInstaller() ' Build command line Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _ " /Dtop_srcdir=""" & rootFolder & """" & _ - " /Dbuild_dir=""" & targetFolder & """" & _ - " /Dtext_dir=""" & rootFolder & """" & _ + " /Dstaging_dir=""" & targetFolder & """" & _ " /DARCH=""" & arch & """" & _ - " """ & rootFolder & "\dists\nsis\scummvm.nsi""" + " """ & rootFolder & "\dists\win32\scummvm.nsi""" Dim oExec: Set oExec = WshShell.Exec(commandline) If Err.Number <> 0 Then -- cgit v1.2.3 From 14733b6112f214c1c37e01a21bef6de7ac463c68 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 2 Jul 2011 18:37:02 -0400 Subject: CREATE_PROJECT: Remove copying of README-SDL in postbuild command script --- devtools/create_project/scripts/postbuild.cmd | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index a5051d8228..dd52c0217c 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -23,23 +23,7 @@ if "%~5"=="" goto error_installer echo Copying data files echo. -REM xcopy /F /Y "%~1/AUTHORS" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/COPYING.GPL" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/COPYING" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/COPYING.LGPL" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/COPYRIGHT" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/NEWS" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/README" %~2 1>NUL 2>&1 - -REM xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/gui/themes/*.zip" %~2 1>NUL 2>&1 -REM xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 1>NUL 2>&1 - -xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2" 1>NUL 2>&1 -xcopy /F /Y "%~4/README-SDL" "%~2" 1>NUL 2>&1 - +xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2" 1>NUL 2>&1 xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1 if "%~5"=="0" goto done -- cgit v1.2.3 From ec3b9314e8cddb4636e45d414f3d7c78dd9f716e Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Sat, 9 Jul 2011 09:44:34 +0200 Subject: CREATE_PROJECT: Quote parameters in MSVC10 post-build step. Also, do the same commands for Release and Debug. --- .../create_project/msvc10/create_project.vcxproj | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj index 3d7f8fdd3d..40c515f26b 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc10/create_project.vcxproj @@ -59,11 +59,11 @@ @echo off -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\ +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" @@ -84,10 +84,12 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\ MachineX86 - xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ + @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" @@ -120,4 +122,4 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ - \ No newline at end of file + -- cgit v1.2.3 From 2cdd83141ab2cf364de62973de4c014944836f73 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 19 Jul 2011 10:50:12 +0300 Subject: CREATE_PROJECT: Enabled the new Bink video support feature --- devtools/create_project/create_project.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools/create_project') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 35d08561bf..0b190b3f0e 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -773,6 +773,7 @@ const Feature s_features[] = { { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, // Feature flags + { "bink", "USE_BINK", "", true, "Bink video support" }, { "scalers", "USE_SCALERS", "", true, "Scalers" }, { "hqscalers", "USE_HQ_SCALERS", "", true, "HQ scalers" }, { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, -- cgit v1.2.3