Changeset 10894

Timestamp:
Jan 11, 2012, 6:43:07 PM (13 years ago)
Author:
philip
Message:

Remove Premake's (seemingly undocumented) usage of the ARCH environment variable, which is usually unset but causes build failures in some build environments that set it.
Remake Premake's Makefiles with current patched version of Premake.

Location:
ps/trunk/build/premake/premake4
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • ps/trunk/build/premake/premake4/build/gmake.unix/Premake4.make

    r9878 r10894  
    2727  INCLUDES  += -I../../src/host/lua-5.1.4/src
    2828  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
    29   CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -Os
     29  CFLAGS    += $(CPPFLAGS) -Wall -Os
    3030  CXXFLAGS  += $(CFLAGS)
    3131  LDFLAGS   += -s -rdynamic
    32   LIBS      += -lm -ldl
     32  LIBS      += -lm -ldl
    3333  RESFLAGS  += $(DEFINES) $(INCLUDES)
    3434  LDDEPS    +=
    35   LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
     35  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
    3636  define PREBUILDCMDS
    3737  endef
    … …  
    4949  INCLUDES  += -I../../src/host/lua-5.1.4/src
    5050  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
    51   CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g
     51  CFLAGS    += $(CPPFLAGS) -Wall -g
    5252  CXXFLAGS  += $(CFLAGS)
    5353  LDFLAGS   += -rdynamic
    54   LIBS      += -lm -ldl
     54  LIBS      += -lm -ldl
    5555  RESFLAGS  += $(DEFINES) $(INCLUDES)
    5656  LDDEPS    +=
    57   LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
     57  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
    5858  define PREBUILDCMDS
    5959  endef
    … …  
    121121.PHONY: clean prebuild prelink
    122122
    123 all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
     123all: $(TARGET)
    124124    @:
    125125
    126 $(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
     126$(TARGET): $(
    127127    @echo Linking Premake4
    128128    $(SILENT) $(LINKCMD)
    … …  
    155155endif
    156156
    157 prebuild:
     157prebuild:
    158158    $(PREBUILDCMDS)
    159159
    … …  
    162162
    163163ifneq (,$(PCH))
    164 $(GCH): $(PCH)
     164$(GCH): $(PCH)
    165165    @echo $(notdir $<)
    166166    -$(SILENT) cp $< $(OBJDIR)
    … …  
    168168endif
    169169
    170 $(OBJDIR)/os_getcwd.o: ../../src/host/os_getcwd.c
    171     @echo $(notdir $<)
    172     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    173 $(OBJDIR)/path_isabsolute.o: ../../src/host/path_isabsolute.c
    174     @echo $(notdir $<)
    175     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    176 $(OBJDIR)/os_isdir.o: ../../src/host/os_isdir.c
    177     @echo $(notdir $<)
    178     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    179 $(OBJDIR)/os_rmdir.o: ../../src/host/os_rmdir.c
    180     @echo $(notdir $<)
    181     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    182 $(OBJDIR)/os_chdir.o: ../../src/host/os_chdir.c
    183     @echo $(notdir $<)
    184     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    185 $(OBJDIR)/os_uuid.o: ../../src/host/os_uuid.c
    186     @echo $(notdir $<)
    187     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    188 $(OBJDIR)/os_isfile.o: ../../src/host/os_isfile.c
    189     @echo $(notdir $<)
    190     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    191 $(OBJDIR)/os_match.o: ../../src/host/os_match.c
    192     @echo $(notdir $<)
    193     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    194 $(OBJDIR)/os_pathsearch.o: ../../src/host/os_pathsearch.c
    195     @echo $(notdir $<)
    196     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    197 $(OBJDIR)/os_copyfile.o: ../../src/host/os_copyfile.c
    198     @echo $(notdir $<)
    199     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    200 $(OBJDIR)/os_mkdir.o: ../../src/host/os_mkdir.c
    201     @echo $(notdir $<)
    202     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    203 $(OBJDIR)/premake.o: ../../src/host/premake.c
    204     @echo $(notdir $<)
    205     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    206 $(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c
    207     @echo $(notdir $<)
    208     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    209 $(OBJDIR)/scripts.o: ../../src/host/scripts.c
    210     @echo $(notdir $<)
    211     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    212 $(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c
    213     @echo $(notdir $<)
    214     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    215 $(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c
    216     @echo $(notdir $<)
    217     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    218 $(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c
    219     @echo $(notdir $<)
    220     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    221 $(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c
    222     @echo $(notdir $<)
    223     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    224 $(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c
    225     @echo $(notdir $<)
    226     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    227 $(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c
    228     @echo $(notdir $<)
    229     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    230 $(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c
    231     @echo $(notdir $<)
    232     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    233 $(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c
    234     @echo $(notdir $<)
    235     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    236 $(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c
    237     @echo $(notdir $<)
    238     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    239 $(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c
    240     @echo $(notdir $<)
    241     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    242 $(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c
    243     @echo $(notdir $<)
    244     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    245 $(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c
    246     @echo $(notdir $<)
    247     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    248 $(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c
    249     @echo $(notdir $<)
    250     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    251 $(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c
    252     @echo $(notdir $<)
    253     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    254 $(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c
    255     @echo $(notdir $<)
    256     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    257 $(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c
    258     @echo $(notdir $<)
    259     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    260 $(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c
    261     @echo $(notdir $<)
    262     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    263 $(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c
    264     @echo $(notdir $<)
    265     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    266 $(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c
    267     @echo $(notdir $<)
    268     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    269 $(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c
    270     @echo $(notdir $<)
    271     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    272 $(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c
    273     @echo $(notdir $<)
    274     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    275 $(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c
    276     @echo $(notdir $<)
    277     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    278 $(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c
    279     @echo $(notdir $<)
    280     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    281 $(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c
    282     @echo $(notdir $<)
    283     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    284 $(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c
    285     @echo $(notdir $<)
    286     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    287 $(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c
    288     @echo $(notdir $<)
    289     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    290 $(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c
    291     @echo $(notdir $<)
    292     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    293 $(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c
    294     @echo $(notdir $<)
    295     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
    296 $(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c
    297     @echo $(notdir $<)
    298     $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
     170$(OBJDIR)/os_getcwd.o: ../../src/host/os_getcwd.c
     171    @echo $(notdir $<)
     172    $(SILENT) $(CC) $( -o "$@" -c "$<"
     173$(OBJDIR)/path_isabsolute.o: ../../src/host/path_isabsolute.c
     174    @echo $(notdir $<)
     175    $(SILENT) $(CC) $( -o "$@" -c "$<"
     176$(OBJDIR)/os_isdir.o: ../../src/host/os_isdir.c
     177    @echo $(notdir $<)
     178    $(SILENT) $(CC) $( -o "$@" -c "$<"
     179$(OBJDIR)/os_rmdir.o: ../../src/host/os_rmdir.c
     180    @echo $(notdir $<)
     181    $(SILENT) $(CC) $( -o "$@" -c "$<"
     182$(OBJDIR)/os_chdir.o: ../../src/host/os_chdir.c
     183    @echo $(notdir $<)
     184    $(SILENT) $(CC) $( -o "$@" -c "$<"
     185$(OBJDIR)/os_uuid.o: ../../src/host/os_uuid.c
     186    @echo $(notdir $<)
     187    $(SILENT) $(CC) $( -o "$@" -c "$<"
     188$(OBJDIR)/os_isfile.o: ../../src/host/os_isfile.c
     189    @echo $(notdir $<)
     190    $(SILENT) $(CC) $( -o "$@" -c "$<"
     191$(OBJDIR)/os_match.o: ../../src/host/os_match.c
     192    @echo $(notdir $<)
     193    $(SILENT) $(CC) $( -o "$@" -c "$<"
     194$(OBJDIR)/os_pathsearch.o: ../../src/host/os_pathsearch.c
     195    @echo $(notdir $<)
     196    $(SILENT) $(CC) $( -o "$@" -c "$<"
     197$(OBJDIR)/os_copyfile.o: ../../src/host/os_copyfile.c
     198    @echo $(notdir $<)
     199    $(SILENT) $(CC) $( -o "$@" -c "$<"
     200$(OBJDIR)/os_mkdir.o: ../../src/host/os_mkdir.c
     201    @echo $(notdir $<)
     202    $(SILENT) $(CC) $( -o "$@" -c "$<"
     203$(OBJDIR)/premake.o: ../../src/host/premake.c
     204    @echo $(notdir $<)
     205    $(SILENT) $(CC) $( -o "$@" -c "$<"
     206$(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c
     207    @echo $(notdir $<)
     208    $(SILENT) $(CC) $( -o "$@" -c "$<"
     209$(OBJDIR)/scripts.o: ../../src/host/scripts.c
     210    @echo $(notdir $<)
     211    $(SILENT) $(CC) $( -o "$@" -c "$<"
     212$(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c
     213    @echo $(notdir $<)
     214    $(SILENT) $(CC) $( -o "$@" -c "$<"
     215$(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c
     216    @echo $(notdir $<)
     217    $(SILENT) $(CC) $( -o "$@" -c "$<"
     218$(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c
     219    @echo $(notdir $<)
     220    $(SILENT) $(CC) $( -o "$@" -c "$<"
     221$(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c
     222    @echo $(notdir $<)
     223    $(SILENT) $(CC) $( -o "$@" -c "$<"
     224$(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c
     225    @echo $(notdir $<)
     226    $(SILENT) $(CC) $( -o "$@" -c "$<"
     227$(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c
     228    @echo $(notdir $<)
     229    $(SILENT) $(CC) $( -o "$@" -c "$<"
     230$(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c
     231    @echo $(notdir $<)
     232    $(SILENT) $(CC) $( -o "$@" -c "$<"
     233$(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c
     234    @echo $(notdir $<)
     235    $(SILENT) $(CC) $( -o "$@" -c "$<"
     236$(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c
     237    @echo $(notdir $<)
     238    $(SILENT) $(CC) $( -o "$@" -c "$<"
     239$(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c
     240    @echo $(notdir $<)
     241    $(SILENT) $(CC) $( -o "$@" -c "$<"
     242$(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c
     243    @echo $(notdir $<)
     244    $(SILENT) $(CC) $( -o "$@" -c "$<"
     245$(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c
     246    @echo $(notdir $<)
     247    $(SILENT) $(CC) $( -o "$@" -c "$<"
     248$(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c
     249    @echo $(notdir $<)
     250    $(SILENT) $(CC) $( -o "$@" -c "$<"
     251$(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c
     252    @echo $(notdir $<)
     253    $(SILENT) $(CC) $( -o "$@" -c "$<"
     254$(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c
     255    @echo $(notdir $<)
     256    $(SILENT) $(CC) $( -o "$@" -c "$<"
     257$(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c
     258    @echo $(notdir $<)
     259    $(SILENT) $(CC) $( -o "$@" -c "$<"
     260$(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c
     261    @echo $(notdir $<)
     262    $(SILENT) $(CC) $( -o "$@" -c "$<"
     263$(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c
     264    @echo $(notdir $<)
     265    $(SILENT) $(CC) $( -o "$@" -c "$<"
     266$(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c
     267    @echo $(notdir $<)
     268    $(SILENT) $(CC) $( -o "$@" -c "$<"
     269$(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c
     270    @echo $(notdir $<)
     271    $(SILENT) $(CC) $( -o "$@" -c "$<"
     272$(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c
     273    @echo $(notdir $<)
     274    $(SILENT) $(CC) $( -o "$@" -c "$<"
     275$(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c
     276    @echo $(notdir $<)
     277    $(SILENT) $(CC) $( -o "$@" -c "$<"
     278$(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c
     279    @echo $(notdir $<)
     280    $(SILENT) $(CC) $( -o "$@" -c "$<"
     281$(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c
     282    @echo $(notdir $<)
     283    $(SILENT) $(CC) $( -o "$@" -c "$<"
     284$(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c
     285    @echo $(notdir $<)
     286    $(SILENT) $(CC) $( -o "$@" -c "$<"
     287$(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c
     288    @echo $(notdir $<)
     289    $(SILENT) $(CC) $( -o "$@" -c "$<"
     290$(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c
     291    @echo $(notdir $<)
     292    $(SILENT) $(CC) $( -o "$@" -c "$<"
     293$(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c
     294    @echo $(notdir $<)
     295    $(SILENT) $(CC) $( -o "$@" -c "$<"
     296$(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c
     297    @echo $(notdir $<)
     298    $(SILENT) $(CC) $( -o "$@" -c "$<"
    299299
    300300-include $(OBJECTS:%.o=%.d)
     301

  • ps/trunk/build/premake/premake4/src/actions/make/make_cpp.lua

    r10749 r10894  
    249249        _.pchconfig(cfg)
    250250               
    251         _p('  CFLAGS    += $(CPPFLAGS) $(ARCH) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " "))
     251        _p('  CFLAGS    += $(CPPFLAGS) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " "))
    252252        _p('  CXXFLAGS  += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), " "))
    253253        _p('  LDFLAGS   += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc.getlibdirflags(cfg)), " "))
    … …  
    273273                lddeps = '-Xlinker --start-group $(LDDEPS) -Xlinker --end-group'
    274274            end
    275             _p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) %s $(LIBS)',
     275            _p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) %s $(LIBS)',
    276276            iif(cfg.language == "C", "CC", "CXX"), lddeps)
    277277        end

  • ps/trunk/build/premake/premake4/src/host/scripts.c

    r10814 r10894  
    149149    "'\nif os.is('windows') then\nopts = ''\nelseif os.is('macosx') then\nopts = '-D OS_UNIX=1'\nelse\nopts = '-D DONT_USE_UNDERLINE=1 -D OS_UNIX=1'\nend\nif not (prj.solution.nasmpath) then\nprj.solution.nasmpath = 'nasm'\nend\n_p('\\t$(SILENT)'.._MAKE.esc(prj.solution.nasmpath)..' '..opts..' -i'.._MAKE.esc(path.getdirectory(file))..'/'..' -f '..\n   _MAKE.esc(prj.solution.nasmformat)..' -o $@ $<\\n\\t')\n_p('\\t$(SILENT)'.._MAKE.esc(prj.solution.nasmpath)..' '..opts..' -i'.._MAKE.esc(path.getdirectory(file))..'/'..\n   ' -M -o $@ $< >$(OBJDIR)/$(<F:%%.asm=%%.d)\\n')\nend\nend\n_p('')\nif(prj.cxxtestpath and prj.cxxtestrootfile and prj.cxxtesthdrfiles and prj.cxxtestsrcfiles) then\nif not(prj.cxxtestrootoptions) then\nprj.cxxtestrootoptions = ''\nend\nif not(prj.cxxtestoptions) then \nprj.cxxtestoptions = ''\nend\n_p(prj.cxxtestrootfile..': ')\n_p('\\t@echo $(notdir $<)')\n_p('\\t$(SILENT)'.._MAKE.esc(prj.cxxtestpath)..' --root '..prj.cxxtestrootoptions..' -o '.._MAKE.esc(prj.cxxtestrootfile))\n_p('')\nfor i, file"
    150150    " in ipairs(prj.cxxtesthdrfiles) do\n_p('%s: %s', _MAKE.esc(prj.cxxtestsrcfiles[i]), _MAKE.esc(file))\n_p('\\t@echo $(notdir $<)')\n_p('\\t$(SILENT)'.._MAKE.esc(prj.cxxtestpath)..' --part '..prj.cxxtestoptions..' -o ' .._MAKE.esc(prj.cxxtestsrcfiles[i])..' '.._MAKE.esc(file))\nend\n_p('')\nend\n_p('-include $(OBJECTS:%%.o=%%.d)')\n_p('-include $(GCH:%%.h.gch=%%.h.d)')\nend\nfunction premake.gmake_cpp_header(prj, cc, platforms)\n_p('# %s project makefile autogenerated by Premake', premake.action.current().shortname)\n_p('ifndef config')\n_p('  config=%s', _MAKE.esc(premake.getconfigname(prj.solution.configurations[1], platforms[1], true)))\n_p('endif')\n_p('')\n_p('ifndef verbose')\n_p('  SILENT = @')\n_p('endif')\n_p('')\n_p('ifndef CC')\n_p('  CC = %s', cc.cc)\n_p('endif')\n_p('')\n_p('ifndef CXX')\n_p('  CXX = %s', cc.cxx)\n_p('endif')\n_p('')\n_p('ifndef AR')\n_p('  AR = %s', cc.ar)\n_p('endif')\n_p('')\nend\nfunction premake.gmake_cpp_config(cfg, cc)\n_p('ifeq ($(config),%s)', _MAKE.esc(cfg.shortname))\nloc"
    151     "al platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p('  CC         = %s', platform.cc)\nend\nif platform.cxx then\n_p('  CXX        = %s', platform.cxx)\nend\nif platform.ar then\n_p('  AR         = %s', platform.ar)\nend\nif not(cfg.gnuexternals) then\ncfg.gnuexternal = { }\nend \n_p('  OBJDIR     = %s', _MAKE.esc(cfg.objectsdir))\n_p('  TARGETDIR  = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p('  TARGET     = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p('  DEFINES   += %s', table.concat(cc.getdefines(cfg.defines), \" \"))\n_p('  INCLUDES  += %s', table.concat(cc.getincludedirs(cfg.includedirs), \" \"))\n_p('  CPPFLAGS  += %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_.pchconfig(cfg)\n_p('  CFLAGS    += $(CPPFLAGS) $(ARCH) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), \" \"))\n_p('  CXXFLAGS  += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), \" \"))\n_p('  LDFLAGS   += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc"
    152     ".getlibdirflags(cfg)), \" \"))\n_p('  LIBS      += %s %s', table.concat(cc.getlinkflags(cfg), \" \"), table.concat(cfg.gnuexternals, \" \"))\n_p('  RESFLAGS  += $(DEFINES) $(INCLUDES) %s', table.concat(table.join(cc.getdefines(cfg.resdefines), cc.getincludedirs(cfg.resincludedirs), cfg.resoptions), \" \"))\n_p('  LDDEPS    += %s', table.concat(_MAKE.esc(premake.getlinks(cfg, \"static\", \"fullpath\")), \" \"))\nif cfg.kind == \"StaticLib\" then\nif cfg.platform:startswith(\"Universal\") then\n_p('  LINKCMD    = libtool -o $(TARGET) $(OBJECTS)')\nelse\n_p('  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)')\nend\nelse\nlocal lddeps = ''\nif os.is('macosx') then\nlddeps = '$(LDDEPS)'\nelse\nlddeps = '-Xlinker --start-group $(LDDEPS) -Xlinker --end-group'\nend\n_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) %s $(LIBS)', \niif(cfg.language == \"C\", \"CC\", \"CXX\"), lddeps)\nend\n_p('  define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands'"
    153     ")\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('  define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('  define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('endif')\n_p('')\nend\nfunction _.pchconfig(cfg)\nif not cfg.flags.NoPCH and cfg.pchheader then\n_p('  PCH        = %s', _MAKE.esc(cfg.pchheader))\n_p('  GCH        = $(OBJDIR)/%s.gch', _MAKE.esc(path.getname(cfg.pchheader))) \n_p('  PCHINCLUDES = -I$(OBJDIR) -include $(OBJDIR)/%s', _MAKE.esc(path.getname(cfg.pchheader)))\nend\nend\nfunction _.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH) | $(OBJDIR)')\n_p('\\t@echo $(notdir $<)')\n_p('\\t-$(SILENT) cp $< $(OBJDIR)')\nif prj.language == \"C\" then\n_p('\\t$"
    154     "(SILENT) $(CC) $(CFLAGS) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"')\nend\n_p('endif')\n_p('')\nend\n",
     151    "al platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p('  CC         = %s', platform.cc)\nend\nif platform.cxx then\n_p('  CXX        = %s', platform.cxx)\nend\nif platform.ar then\n_p('  AR         = %s', platform.ar)\nend\nif not(cfg.gnuexternals) then\ncfg.gnuexternal = { }\nend \n_p('  OBJDIR     = %s', _MAKE.esc(cfg.objectsdir))\n_p('  TARGETDIR  = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p('  TARGET     = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p('  DEFINES   += %s', table.concat(cc.getdefines(cfg.defines), \" \"))\n_p('  INCLUDES  += %s', table.concat(cc.getincludedirs(cfg.includedirs), \" \"))\n_p('  CPPFLAGS  += %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_.pchconfig(cfg)\n_p('  CFLAGS    += $(CPPFLAGS) "
     152    ""
     153    "$"
     154    "(CFLAGS) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"')\nend\n_p('endif')\n_p('')\nend\n",
    155155
    156156    /* actions/make/make_csharp.lua */
Note: See TracChangeset for help on using the changeset viewer.