diff options
| author | Russell Rice | 2010-09-10 04:26:06 +0000 |
|---|---|---|
| committer | Russell Rice | 2010-09-10 04:26:06 +0000 |
| commit | 4b161bb861834754537ee014d045c21399f97cf8 (patch) | |
| tree | e92c71cfc7c151574df4a5960fd0cc1c5f22a451 /codeblocks/doom.cbp | |
| parent | d086fa7b7e200a86ada6b482a616b02f4eb1e77b (diff) | |
| download | chocolate-doom-4b161bb861834754537ee014d045c21399f97cf8.tar.gz chocolate-doom-4b161bb861834754537ee014d045c21399f97cf8.tar.bz2 chocolate-doom-4b161bb861834754537ee014d045c21399f97cf8.zip | |
- Add opl project file
- Update all codeblocks projects to correlate with earlier merge
- Everything builds except the setup project, it is missing the
setup-manifest.xml file
Subversion-branch: /branches/strife-branch
Subversion-revision: 2055
Diffstat (limited to 'codeblocks/doom.cbp')
| -rw-r--r-- | codeblocks/doom.cbp | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/codeblocks/doom.cbp b/codeblocks/doom.cbp index e589dcc1..09addfae 100644 --- a/codeblocks/doom.cbp +++ b/codeblocks/doom.cbp @@ -18,7 +18,7 @@ <Add option="-gdwarf-2" /> </Compiler> <Linker> - <Add option="-lpcsound-dbg -ltextscreen-dbg" /> + <Add option="-lopl-dbg -lpcsound-dbg -ltextscreen-dbg" /> </Linker> </Target> <Target title="Release"> @@ -33,7 +33,7 @@ </Compiler> <Linker> <Add option="-s" /> - <Add option="-lpcsound -ltextscreen" /> + <Add option="-lopl -lpcsound -ltextscreen" /> </Linker> </Target> </Build> @@ -48,6 +48,7 @@ <Add directory="..\src\doom" /> <Add directory="..\textscreen" /> <Add directory="..\pcsound" /> + <Add directory="..\opl" /> </Compiler> <Linker> <Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" /> @@ -70,10 +71,26 @@ </Unit> <Unit filename="..\src\d_mode.h" /> <Unit filename="..\src\d_ticcmd.h" /> + <Unit filename="..\src\deh_defs.h" /> + <Unit filename="..\src\deh_io.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\deh_io.h" /> + <Unit filename="..\src\deh_main.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\deh_main.h" /> + <Unit filename="..\src\deh_mapping.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\deh_mapping.h" /> <Unit filename="..\src\deh_str.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\src\deh_str.h" /> + <Unit filename="..\src\deh_text.c"> + <Option compilerVar="CC" /> + </Unit> <Unit filename="..\src\doom\am_map.c"> <Option compilerVar="CC" /> </Unit> @@ -100,22 +117,12 @@ <Unit filename="..\src\doom\deh_cheat.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="..\src\doom\deh_defs.h" /> - <Unit filename="..\src\doom\deh_frame.c"> - <Option compilerVar="CC" /> - </Unit> - <Unit filename="..\src\doom\deh_io.c"> - <Option compilerVar="CC" /> - </Unit> - <Unit filename="..\src\doom\deh_io.h" /> - <Unit filename="..\src\doom\deh_main.c"> + <Unit filename="..\src\doom\deh_doom.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="..\src\doom\deh_main.h" /> - <Unit filename="..\src\doom\deh_mapping.c"> + <Unit filename="..\src\doom\deh_frame.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="..\src\doom\deh_mapping.h" /> <Unit filename="..\src\doom\deh_misc.c"> <Option compilerVar="CC" /> </Unit> @@ -126,9 +133,6 @@ <Unit filename="..\src\doom\deh_sound.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="..\src\doom\deh_text.c"> - <Option compilerVar="CC" /> - </Unit> <Unit filename="..\src\doom\deh_thing.c"> <Option compilerVar="CC" /> </Unit> @@ -318,6 +322,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> @@ -387,6 +394,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> @@ -404,9 +415,6 @@ </Unit> <Unit filename="..\src\net_dedicated.h" /> <Unit filename="..\src\net_defs.h" /> - <Unit filename="..\src\net_gui.c"> - <Option compilerVar="CC" /> - </Unit> <Unit filename="..\src\net_gui.h" /> <Unit filename="..\src\net_io.c"> <Option compilerVar="CC" /> @@ -462,6 +470,10 @@ <Unit filename="..\src\w_file_win32.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="..\src\w_main.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\w_main.h" /> <Unit filename="..\src\w_merge.c"> <Option compilerVar="CC" /> </Unit> |