Fixed the linux make file and the codeblocks project file to both copy the lib files into the /lib/ directory.

This commit is contained in:
Raynaldo Rivera 2010-03-17 01:12:57 +00:00
parent 09134ef6c9
commit bbc914109f
3 changed files with 15 additions and 60 deletions

View File

@ -17,21 +17,21 @@ all: shared
shared: $(OBJECT)
$(CC) -o $(SONAME) $(OBJECT) $(LINK_OPTIONS) $(DEPEND)
cp libcAudio.$(VERSION).so ../bin/linux-x86
cp libcAudio.$(VERSION).so ../lib/linux-x86
if test -f ../bin/linux-x86/libcAudio.so;\
then rm ../bin/linux-x86/libcAudio.so;\
ln -s libcAudio.$(VERSION).so ../bin/linux-x86/libcAudio.so;\
else ln -s libcAudio.$(VERSION).so ../bin/linux-x86/libcAudio.so;\
ln -s ../../lib/linux-x86/libcAudio.$(VERSION).so ../bin/linux-x86/libcAudio.so;\
else ln -s ../../lib/linux-x86/libcAudio.$(VERSION).so ../bin/linux-x86/libcAudio.so;\
fi
static: $(OBJECT)
ar cr libcAudio.$(VERSION).a *.o $(STATICDEPEND)
ranlib libcAudio.$(VERSION).a
cp libcAudio.$(VERSION).a ../bin/linux-x86
cp libcAudio.$(VERSION).a ../lib/linux-x86
if test -f ../bin/linux-x86/libcAudio.a;\
then rm ../bin/linux-x86/libcAudio.a;\
ln -s libcAudio.$(VERSION).a ../bin/linux-x86/libcAudio.a;\
else ln -s libcAudio.$(VERSION).a ../bin/linux-x86/libcAudio.a;\
ln -s ../../lib/linux-x86/libcAudio.$(VERSION).a ../bin/linux-x86/libcAudio.a;\
else ln -s ../../lib/linux-x86/libcAudio.$(VERSION).a ../bin/linux-x86/libcAudio.a;\
fi;
install: $(OBJECT)

View File

@ -28,6 +28,10 @@
<Add library="OpenAL32" />
<Add directory="dependencies\Libs\windows-mingw" />
</Linker>
<ExtraCommands>
<Add after='cmd /c copy &quot;$(PROJECT_DIR)\bin\win32-gcc\libcAudio_d.a&quot; &quot;$(PROJECT_DIR)\lib\win32-gcc\&quot;' />
<Mode after="always" />
</ExtraCommands>
</Target>
<Target title="Release">
<Option output="bin\win32-gcc\cAudio" prefix_auto="1" extension_auto="1" />
@ -51,58 +55,9 @@
<Add library="OpenAL32" />
<Add directory="dependencies\Libs\windows-mingw" />
</Linker>
</Target>
<Target title="Debug Visual">
<Option output="bin\visual\cAudio_d" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\visual\" />
<Option type="3" />
<Option compiler="msvc8" />
<Option createStaticLib="1" />
<Compiler>
<Add option="/EHc" />
<Add option="/EHa" />
<Add option="/EHs" />
<Add option="/Ot" />
<Add option="/O2" />
<Add option="/Zi /D_DEBUG" />
<Add directory="include" />
<Add directory="Headers" />
<Add directory="dependencies\Headers" />
<Add directory="dependencies\Headers\AL" />
</Compiler>
<Linker>
<Add option="/DEBUG" />
<Add option="-s" />
<Add library="vorbisfile_static" />
<Add library="vorbis_static" />
<Add library="ogg_static" />
<Add library="OpenAL32" />
</Linker>
</Target>
<Target title="Release Visual">
<Option output="bin\visual\cAudio" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\visual\" />
<Option type="3" />
<Option compiler="msvc8" />
<Option createStaticLib="1" />
<Compiler>
<Add option="/EHc" />
<Add option="/EHa" />
<Add option="/EHs" />
<Add option="/Ot" />
<Add option="/O2" />
<Add directory="include" />
<Add directory="Headers" />
<Add directory="dependencies\Headers" />
<Add directory="dependencies\Headers\AL" />
</Compiler>
<Linker>
<Add option="-s" />
<Add library="vorbisfile_static" />
<Add library="vorbis_static" />
<Add library="ogg_static" />
<Add library="OpenAL32" />
</Linker>
<ExtraCommands>
<Add after='cmd /c copy &quot;$(PROJECT_DIR)\bin\win32-gcc\libcAudio.a&quot; &quot;$(PROJECT_DIR)\lib\win32-gcc\&quot;' />
</ExtraCommands>
</Target>
</Build>
<Compiler>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="Workspace">
<Project filename="cAudio.cbp" />
<Project filename="cAudio.cbp" active="1" />
<Project filename="Examples\Tutorial1_2DSound\Tutorial1_2DSound.cbp" />
<Project filename="Examples\Tutorial2_3DSound\Tutorial2_3DSound.cbp" />
<Project filename="Examples\Tutorial3_MemoryPlayback\Tutorial3_MemoryPlayback.cbp" />
@ -11,6 +11,6 @@
<Project filename="Examples\Tutorial7_CustomLogReceiver\Tutorial7_CustomLogReceiver.cbp" />
<Project filename="plugins\mp3Decoder\mp3Decoder.cbp" />
<Project filename="plugins\EAXLegacyPreset\EAXLegacyPreset.cbp" />
<Project filename="tests\Stress_Test\Stress_Test.cbp" active="1" />
<Project filename="tests\Stress_Test\Stress_Test.cbp" />
</Workspace>
</CodeBlocks_workspace_file>