Skip to content

Commit

Permalink
Dev Kit: mkdtemp not available on Windows and Win-installer related a…
Browse files Browse the repository at this point in the history
…djustments.

git-svn-id: svn://svn.code.sf.net/p/opensludge/code@392 27a91dd4-ec73-4ff0-838b-64dfa05f697e
  • Loading branch information
tobihan committed Jan 27, 2011
1 parent f407b79 commit 4bc57ac
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doc/Credits.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
{\*\pgdscno2}\paperh16837\paperw11905\margl1134\margr567\margt567\margb567\sectd\sbknone\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn567\margtsxn567\margbsxn567\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
\pard\plain \ltrpar\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af2\afs18\lang255\ltrch\dbch\af2\langfe255\hich\f2\fs18\lang1031\loch\f2\fs18\lang1031 {\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0 The SLUDGE Adventure game engine and development kit is created by {\ltrch\hich\b\loch\b Tim Furnish}.}
\par \pard\plain \ltrpar\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af2\afs18\lang255\ltrch\dbch\af2\langfe255\hich\f2\fs18\lang1031\loch\f2\fs18\lang1031 {\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0 Continued development by Rikard Peterson and Tobias Hansen.}
\par \pard\plain \ltrpar\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af2\afs18\lang255\ltrch\dbch\af2\langfe255\hich\f2\fs18\lang1031\loch\f2\fs18\lang1031 {\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0 Icons, logo and other graphics created by Erwin Broekhuis.}
\par \pard\plain \ltrpar\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af2\afs18\lang255\ltrch\dbch\af2\langfe255\hich\f2\fs18\lang1031\loch\f2\fs18\lang1031 {\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0 Additional coding on the Windows version by Charlie Wolf.}
\par \pard\plain \ltrpar\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af2\afs18\lang255\ltrch\dbch\af2\langfe255\hich\f2\fs18\lang1031\loch\f2\fs18\lang1031 {\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0 Some graphics by Erwin Broekhuis.}
\par \pard\plain \ltrpar\s7\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\brdrb\brdrdb\brdrw15\brdrcf4\brsp0{\*\brdrb\brdlncol4\brdlnin1\brdlnout1\brdlndist20}\brsp0\rtlch\af8\afs24\lang255\ltrch\dbch\af8\langfe255\hich\f0\fs12\lang1031\loch\f0\fs12\lang1031
\par \pard\plain \ltrpar\s17\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb240\sa283\keepn\rtlch\af8\afs24\lang255\ab\ltrch\dbch\af8\langfe255\hich\f0\fs24\lang1031\b\loch\f0\fs24\lang1031\b {\rtlch \ltrch\loch\f0\fs24\lang1031\i0\b SLUDGE makes use of the following libraries:}
\par \pard\plain \ltrpar\s3\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af2\afs18\lang255\ltrch\dbch\af2\langfe255\hich\f2\fs18\lang1031\loch\f2\fs18\lang1031{\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0{\ltrch\hich\b\loch\b OpenGL}}{\rtlch \ltrch\loch\f2\fs18\lang1031\i0\b0 - Graphics library.\line {\ltrch\hich\b\loch\b SDL} - multimedia library, licenced under {\field{\*\fldinst HYPERLINK \\l "LGPL" }{\fldrslt \*\cs23\cf2\ul\ulc0\rtlch\ltrch\dbch\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031 GNU LGPL}}\line {\ltrch\hich\b\loch\b OpenAL} - Sound library, licenced under {\field{\*\fldinst HYPERLINK \\l "LGPL" }{\fldrslt \*\cs23\cf2\ul\ulc0\rtlch\ltrch\dbch\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031 GNU LGPL}}.\line {\ltrch\hich\b\loch\b Alure} - OpenAL utility library, licenced under {\field{\*\fldinst HYPERLINK \\l "MIT" }{\fldrslt \*\cs23\cf2\ul\ulc0\rtlch\ltrch\dbch\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031 MIT License}}.\line {\ltrch\hich\b\loch\b libvorbis} - Vorbis codec, liecenced under BSD-like {\field{\*\fldinst HYPERLINK \\l "Xiph.org" }{\fldrslt \*\cs23\cf2\ul\ulc0\rtlch\ltrch\dbch\hich\f0\fs24\lang1031\loch\f0\fs24\lang1031 Xiph.org license}}.\line {\ltrch\hich\b\loch\b l
Expand Down
18 changes: 15 additions & 3 deletions sludge.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,25 @@ SectionIn 1 RO
File images/scriptIcon/scriptIcon.ico
File images/slx/slx.ico

SetOutPath "$INSTDIR\Engine"
File Engine/ALURE32.dll
File Engine/fixScaleSprite.vert
File Engine/libiconv2.dll
File Engine/libvorbis-0.dll
File Engine/OpenAL32.dll
File Engine/scale.vert
File "Engine/SLUDGE Engine.exe"
File Engine/fixScaleSprite.frag
File Engine/libFLAC.dll
File Engine/libogg-0.dll
File Engine/libvorbisfile-3.dll
File Engine/scale.frag
File Engine/SDL.dll

SetOutPath "$INSTDIR"
File doc/Credits.html
File "doc/SLUDGE Dev Kit Help.chm"

;Include the Engine directory, but not the one from "source"
File /r /x source /x .svn Engine

; Add Shortcuts (this inherits the exe's run permissions)
CreateDirectory "$SMPROGRAMS\SLUDGE"
CreateShortCut "$SMPROGRAMS\SLUDGE\SLUDGE Project Manager.lnk" "$INSTDIR\Dev Kit\sludge-projectmanager.exe" "" \
Expand Down
6 changes: 5 additions & 1 deletion source/DevKit/ProjectManager/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,16 @@ bool gotoTempDirectory () {
fixPath (tempDirectory, true);
#ifdef WIN32
mkdir (getTempDir());
if (mktemp (tempDirectory)) {
if (mkdir (tempDirectory))
tempDirectory = NULL;
}
#else
mkdir (getTempDir(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
#endif
if (!mkdtemp (tempDirectory)) {
return addComment (ERRORTYPE_SYSTEMERROR, "Can't create temporary directory", tempDirectory, NULL);
}
#endif
}
if (! tempDirectory) return false;
bool r = chdir (tempDirectory);
Expand Down

0 comments on commit 4bc57ac

Please sign in to comment.