diff --git a/lib/rscons/builders/library.rb b/lib/rscons/builders/library.rb index adffeb1..fc3cfdc 100644 --- a/lib/rscons/builders/library.rb +++ b/lib/rscons/builders/library.rb @@ -6,8 +6,8 @@ module Rscons { 'AR' => 'ar', 'LIBSUFFIX' => '.a', - 'ARFLAGS' => [], - 'ARCMD' => ['${AR}', 'rcs', '${ARFLAGS}', '${_TARGET}', '${_SOURCES}'] + 'ARFLAGS' => ['rcs'], + 'ARCMD' => ['${AR}', '${ARFLAGS}', '${_TARGET}', '${_SOURCES}'] } end diff --git a/lib/rscons/builders/object.rb b/lib/rscons/builders/object.rb index 180f60a..dd88758 100644 --- a/lib/rscons/builders/object.rb +++ b/lib/rscons/builders/object.rb @@ -14,34 +14,40 @@ module Rscons { 'OBJSUFFIX' => '.o', + 'CPPDEFPREFIX' => '-D', + 'INCPREFIX' => '-I', + 'AS' => '${CC}', 'ASFLAGS' => [], 'ASSUFFIX' => '.S', 'ASPPPATH' => '${CPPPATH}', 'ASPPFLAGS' => '${CPPFLAGS}', 'ASDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], - 'ASCMD' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '-I${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'], + 'ASCMD' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '${INCPREFIX}${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'], - 'CPPFLAGS' => [], + 'CPPFLAGS' => ['${CPPDEFPREFIX}${CPPDEFINES}'], + 'CPPDEFINES' => [], 'CPPPATH' => [], + 'CCFLAGS' => [], + 'CC' => 'gcc', 'CFLAGS' => [], 'CSUFFIX' => '.c', 'CCDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], - 'CCCMD' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '-I${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${_SOURCES}'], + 'CCCMD' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${CCFLAGS}', '${_SOURCES}'], 'CXX' => 'g++', 'CXXFLAGS' => [], 'CXXSUFFIX' => '.cc', 'CXXDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], - 'CXXCMD' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '-I${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${_SOURCES}'], + 'CXXCMD' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${CCFLAGS}', '${_SOURCES}'], 'DC' => 'gdc', 'DFLAGS' => [], 'DSUFFIX' => '.d', 'D_IMPORT_PATH' => [], - 'DCCMD' => ['${DC}', '-c', '-o', '${_TARGET}', '-I${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'], + 'DCCMD' => ['${DC}', '-c', '-o', '${_TARGET}', '${INCPREFIX}${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'], } end diff --git a/lib/rscons/builders/program.rb b/lib/rscons/builders/program.rb index 1e3bbc5..aee688b 100644 --- a/lib/rscons/builders/program.rb +++ b/lib/rscons/builders/program.rb @@ -10,8 +10,10 @@ module Rscons 'LIBSUFFIX' => '.a', 'LDFLAGS' => [], 'LIBPATH' => [], + 'LIBDIRPREFIX' => '-L', + 'LIBLINKPREFIX' => '-l', 'LIBS' => [], - 'LDCMD' => ['${LD}', '-o', '${_TARGET}', '${LDFLAGS}', '${_SOURCES}', '-L${LIBPATH}', '-l${LIBS}'] + 'LDCMD' => ['${LD}', '-o', '${_TARGET}', '${LDFLAGS}', '${_SOURCES}', '${LIBDIRPREFIX}${LIBPATH}', '${LIBLINKPREFIX}${LIBS}'] } end