* Add two other Code::Blocks files (projectfile.depend, projectfile.layout) to ignore list

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1915 4a71c877-e1ca-e34f-864e-861f7616d084

data/sequenceaudio/cam1/cam1cnp.txt

@@ -2,4 +2,4 @@
 //x	y		start	end	Text	
 
 20	432		150	325	"Your attacks upon us will not go unpunished."
-0	0		150	325	"You are in contravention of the New Paradigm."
+0	0		150	325	"Tū Paradigmatorem Novum contrā venis"

nsis/warzone2100.nsi

@@ -116,10 +116,6 @@ Section $(TEXT_SecBase) SecBase
   ; Main executable
   File "..\src\warzone2100.exe"
 
-  ; Required runtime libs
-  File "${LIBDIR}\OpenAL32.dll"
-  File "${LIBDIR}\wrap_oal.dll"
-
   ; Windows dbghelp library
   File "${LIBDIR}\dbghelp.dll.license.txt"
   File "${LIBDIR}\dbghelp.dll"
@@ -163,6 +159,21 @@ Section $(TEXT_SecBase) SecBase
 
 SectionEnd
 
+; Installs OpenAL runtime libraries, using Creative's installer
+; Found here: http://developer.creative.com/articles/article.asp?cat=1&sbcat=31&top=38&aid=46
+Section $(TEXT_SecOpenAL) SecOpenAL
+
+  SetOutPath "$TEMP"
+
+  File "${LIBDIR}\oalinst.exe"
+
+  ExecWait "$TEMP\oalinst.exe"
+
+  Delete "$TEMP\oalinst.exe"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
 
 SectionGroup /e $(TEXT_SecMods) secMods
 
@@ -204,6 +215,9 @@ FunctionEnd
   LangString TEXT_SecBase ${LANG_ENGLISH} "Standard installation"
   LangString DESC_SecBase ${LANG_ENGLISH} "Standard installation."
 
+  LangString TEXT_SecOpenAL ${LANG_ENGLISH} "OpenAL libraries"
+  LangString DESC_SecOpenAL ${LANG_ENGLISH} "Required runtime libraries for OpenAL, an opensource/free Audio Library."
+
   LangString TEXT_SecMods ${LANG_ENGLISH} "Mods"
   LangString DESC_SecMods ${LANG_ENGLISH} "Various mods."
 
@@ -215,6 +229,9 @@ FunctionEnd
   LangString TEXT_SecBase ${LANG_GERMAN} "Standardinstallation"
   LangString DESC_SecBase ${LANG_GERMAN} "Standardinstallation."
 
+  LangString TEXT_SecOpenAL ${LANG_GERMAN} "OpenAL Bibliotheken"
+  LangString DESC_SecOpenAL ${LANG_GERMAN} "Benötigte Bibliotheken für OpenAL, eine opensource/free Audio Bibliothek."
+
   LangString TEXT_SecMods ${LANG_GERMAN} "Mods"
   LangString DESC_SecMods ${LANG_GERMAN} "Verschiedene Mods."
 
@@ -232,6 +249,8 @@ FunctionEnd
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${SecBase} $(DESC_SecBase)
 
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenAL} $(DESC_SecOpenAL)
+
     !insertmacro MUI_DESCRIPTION_TEXT ${SecMods} $(DESC_SecMods)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecGrimMod} $(DESC_SecGrimMod)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -247,9 +266,6 @@ Section "Uninstall"
 
   Delete "$INSTDIR\warzone2100.exe"
 
-  Delete "$INSTDIR\OpenAL32.dll"
-  Delete "$INSTDIR\wrap_oal.dll"
-
   Delete "$INSTDIR\dbghelp.dll.license.txt"
   Delete "$INSTDIR\dbghelp.dll"
 

warzone2100.cbp

@@ -34,24 +34,33 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option='-DVERSION=\\&quot;TRUNK\\&quot;' />
-			<Add option='-DLOCALEDIR=\\&quot;\\&quot;' />
-			<Add option='-DPACKAGE=\\&quot;warzone2100\\&quot;' />
+			<Add option='-DVERSION=\&quot;TRUNK\&quot;' />
+			<Add option='-DLOCALEDIR=\&quot;\&quot;' />
+			<Add option='-DPACKAGE=\&quot;warzone2100\&quot;' />
+			<Add option="-DWIN32" />
+			<Add option="-DYY_STATIC" />
 			<Add directory="." />
+			<Add directory="C:\devpkg\include" />
 		</Compiler>
 		<Linker>
+			<Add library="mingw32" />
+			<Add library="SDLmain" />
 			<Add library="physfs" />
 			<Add library="png" />
-			<Add library="m" />
+			<Add library="z" />
 			<Add library="SDL" />
-			<Add library="pthread" />
+			<Add library="gdi32" />
 			<Add library="SDL_net" />
-			<Add library="GL" />
-			<Add library="GLU" />
-			<Add library="openal" />
+			<Add library="opengl32" />
+			<Add library="glu32" />
+			<Add library="openal32" />
 			<Add library="vorbisfile" />
 			<Add library="vorbis" />
 			<Add library="ogg" />
+			<Add library="dbghelp" />
+			<Add library="winmm" />
+			<Add library="wsock32" />
+			<Add directory="C:\devpkg\lib" />
 		</Linker>
 		<Unit filename="lib/framework/SDL_framerate.c">
 			<Option compilerVar="CC" />