diff options
-rw-r--r-- | codeblocks/chocolate.workspace | 5 | ||||
-rw-r--r-- | codeblocks/doom.cbp | 52 | ||||
-rw-r--r-- | codeblocks/heretic.cbp | 55 | ||||
-rw-r--r-- | codeblocks/hexen.cbp | 16 | ||||
-rw-r--r-- | codeblocks/libopl.cbp | 83 | ||||
-rw-r--r-- | codeblocks/libpcsound.cbp | 2 | ||||
-rw-r--r-- | codeblocks/libtextscreen.cbp | 4 | ||||
-rw-r--r-- | codeblocks/strife.cbp | 16 |
8 files changed, 204 insertions, 29 deletions
diff --git a/codeblocks/chocolate.workspace b/codeblocks/chocolate.workspace index 5e13e6b2..2dbca6f3 100644 --- a/codeblocks/chocolate.workspace +++ b/codeblocks/chocolate.workspace @@ -3,18 +3,22 @@ <Workspace title="Chocolate"> <Project filename="doom.cbp" active="1"> <Depends filename="libtextscreen.cbp" /> + <Depends filename="libopl.cbp" /> <Depends filename="libpcsound.cbp" /> </Project> <Project filename="heretic.cbp"> <Depends filename="libtextscreen.cbp" /> + <Depends filename="libopl.cbp" /> <Depends filename="libpcsound.cbp" /> </Project> <Project filename="hexen.cbp"> <Depends filename="libtextscreen.cbp" /> + <Depends filename="libopl.cbp" /> <Depends filename="libpcsound.cbp" /> </Project> <Project filename="strife.cbp"> <Depends filename="libtextscreen.cbp" /> + <Depends filename="libopl.cbp" /> <Depends filename="libpcsound.cbp" /> </Project> <Project filename="server.cbp" /> @@ -22,6 +26,7 @@ <Depends filename="libtextscreen.cbp" /> </Project> <Project filename="libtextscreen.cbp" /> + <Project filename="libopl.cbp" /> <Project filename="libpcsound.cbp" /> </Workspace> </CodeBlocks_workspace_file> 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> diff --git a/codeblocks/heretic.cbp b/codeblocks/heretic.cbp index a18e0710..e0abeaa3 100644 --- a/codeblocks/heretic.cbp +++ b/codeblocks/heretic.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> @@ -49,6 +49,7 @@ <Add directory="..\src\heretic" /> <Add directory="..\textscreen" /> <Add directory="..\pcsound" /> + <Add directory="..\opl" /> </Compiler> <Linker> <Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" /> @@ -71,10 +72,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\doomfeatures.h" /> <Unit filename="..\src\doomkeys.h" /> <Unit filename="..\src\doomtype.h" /> @@ -93,6 +110,28 @@ <Unit filename="..\src\heretic\d_net.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="..\src\heretic\deh_ammo.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\heretic\deh_frame.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\heretic\deh_htext.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\heretic\deh_htic.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\heretic\deh_htic.h" /> + <Unit filename="..\src\heretic\deh_sound.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\heretic\deh_thing.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\heretic\deh_weapon.c"> + <Option compilerVar="CC" /> + </Unit> <Unit filename="..\src\heretic\doomdata.h" /> <Unit filename="..\src\heretic\doomdef.h" /> <Unit filename="..\src\heretic\dstrings.h" /> @@ -116,6 +155,7 @@ <Unit filename="..\src\heretic\mn_menu.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="..\src\heretic\p_action.h" /> <Unit filename="..\src\heretic\p_ceilng.c"> <Option compilerVar="CC" /> </Unit> @@ -220,6 +260,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> @@ -289,6 +332,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> @@ -319,6 +366,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> diff --git a/codeblocks/hexen.cbp b/codeblocks/hexen.cbp index b8165638..db87b9c6 100644 --- a/codeblocks/hexen.cbp +++ b/codeblocks/hexen.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> @@ -49,6 +49,7 @@ <Add directory="..\src\hexen" /> <Add directory="..\textscreen" /> <Add directory="..\pcsound" /> + <Add directory="..\opl" /> </Compiler> <Linker> <Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" /> @@ -249,6 +250,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> @@ -322,6 +326,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> @@ -352,6 +360,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> diff --git a/codeblocks/libopl.cbp b/codeblocks/libopl.cbp new file mode 100644 index 00000000..a38460d0 --- /dev/null +++ b/codeblocks/libopl.cbp @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="libopl" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output="..\lib\libopl-dbg" prefix_auto="1" extension_auto="1" /> + <Option working_dir="" /> + <Option object_output="..\obj\libopl\dbg" /> + <Option type="2" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-gdwarf-2" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output="..\lib\libopl" prefix_auto="1" extension_auto="1" /> + <Option working_dir="" /> + <Option object_output="..\obj\libopl\rel" /> + <Option type="2" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <VirtualTargets> + <Add alias="All" targets="Debug;Release;" /> + </VirtualTargets> + <Compiler> + <Add option="-Wall" /> + <Add directory="." /> + <Add directory="..\src" /> + </Compiler> + <Linker> + <Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -mwindows" /> + </Linker> + <Unit filename="..\opl\dbopl.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\opl\dbopl.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_obsd.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> + <Extensions> + <code_completion /> + <envvars /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> diff --git a/codeblocks/libpcsound.cbp b/codeblocks/libpcsound.cbp index 9ae9843b..83a24a08 100644 --- a/codeblocks/libpcsound.cbp +++ b/codeblocks/libpcsound.cbp @@ -19,7 +19,7 @@ <Target title="Release"> <Option output="..\lib\libpcsound" prefix_auto="1" extension_auto="1" /> <Option working_dir="" /> - <Option object_output="..\obj\libpcsound\release" /> + <Option object_output="..\obj\libpcsound\rel" /> <Option type="2" /> <Option compiler="gcc" /> <Compiler> diff --git a/codeblocks/libtextscreen.cbp b/codeblocks/libtextscreen.cbp index bee3040a..ea5c2a08 100644 --- a/codeblocks/libtextscreen.cbp +++ b/codeblocks/libtextscreen.cbp @@ -9,7 +9,7 @@ <Target title="Debug"> <Option output="..\lib\libtextscreen-dbg.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> - <Option object_output="..\obj\libtextscreen\debug" /> + <Option object_output="..\obj\libtextscreen\dbg" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> @@ -21,7 +21,7 @@ <Target title="Release"> <Option output="..\lib\libtextscreen.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> - <Option object_output="..\obj\libtextscreen\release" /> + <Option object_output="..\obj\libtextscreen\rel" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> diff --git a/codeblocks/strife.cbp b/codeblocks/strife.cbp index 7884cda7..200ba83d 100644 --- a/codeblocks/strife.cbp +++ b/codeblocks/strife.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> @@ -49,6 +49,7 @@ <Add directory="..\src\heretic" /> <Add directory="..\textscreen" /> <Add directory="..\pcsound" /> + <Add directory="..\opl" /> </Compiler> <Linker> <Add option="-lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_net -mwindows" /> @@ -109,6 +110,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> @@ -178,6 +182,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> @@ -425,6 +433,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> |