summaryrefslogtreecommitdiff
path: root/codeblocks
diff options
context:
space:
mode:
authorSimon Howard2010-03-08 01:14:23 +0000
committerSimon Howard2010-03-08 01:14:23 +0000
commit448adb31d703afed9e9cc2bfd109c1fcd34447c4 (patch)
treeca987d9f677ec93263840477bc1eebc9a01fecab /codeblocks
parentc4fe7aa8b6962edf79e0ccec469970618a92b0ef (diff)
parentb9e18229624500d6d2a6112a5c00882d7b7051de (diff)
downloadchocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.tar.gz
chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.tar.bz2
chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.zip
Merge opl-branch to trunk.
OPL support still isn't perfect, and it certainly isn't complete. However, for now, it's good enough. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1878
Diffstat (limited to 'codeblocks')
-rw-r--r--codeblocks/game.cbp38
1 files changed, 38 insertions, 0 deletions
diff --git a/codeblocks/game.cbp b/codeblocks/game.cbp
index bf1c249a..d6313bdf 100644
--- a/codeblocks/game.cbp
+++ b/codeblocks/game.cbp
@@ -46,6 +46,7 @@
<Add directory="..\src" />
<Add directory="..\textscreen" />
<Add directory="..\pcsound" />
+ <Add directory="..\opl" />
</Compiler>
<Linker>
<Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" />
@@ -55,6 +56,36 @@
<Unit filename="game-res.rc">
<Option compilerVar="WINDRES" />
</Unit>
+ <Unit filename="..\opl\fmopl.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\fmopl.h" />
+ <Unit filename="..\opl\ioperm_sys.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\ioperm_sys.h" />
+ <Unit filename="..\opl\opl.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\opl.h" />
+ <Unit filename="..\opl\opl_internal.h" />
+ <Unit filename="..\opl\opl_linux.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\opl_queue.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\opl_queue.h" />
+ <Unit filename="..\opl\opl_sdl.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\opl_timer.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\opl\opl_timer.h" />
+ <Unit filename="..\opl\opl_win32.c">
+ <Option compilerVar="CC" />
+ </Unit>
<Unit filename="..\src\am_map.c">
<Option compilerVar="CC" />
</Unit>
@@ -165,6 +196,9 @@
<Unit filename="..\src\i_main.c">
<Option compilerVar="CC" />
</Unit>
+ <Unit filename="..\src\i_oplmusic.c">
+ <Option compilerVar="CC" />
+ </Unit>
<Unit filename="..\src\i_pcsound.c">
<Option compilerVar="CC" />
</Unit>
@@ -235,6 +269,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\src\memio.h" />
+ <Unit filename="..\src\midifile.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\src\midifile.h" />
<Unit filename="..\src\mus2mid.c">
<Option compilerVar="CC" />
</Unit>