diff options
| author | Mike Pall <mike> | 2012-06-10 01:38:44 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-06-10 02:01:25 +0200 |
| commit | b8f5727ab4ab5656b19cdb2c71a92611836b5458 (patch) | |
| tree | afff6234da61ae8d3a513359a68c88cdb7b6159c /src/Makefile | |
| parent | 37be8a54785b893f531679adb0b479a426938504 (diff) | |
| download | luajit-b8f5727ab4ab5656b19cdb2c71a92611836b5458.tar.gz luajit-b8f5727ab4ab5656b19cdb2c71a92611836b5458.tar.bz2 luajit-b8f5727ab4ab5656b19cdb2c71a92611836b5458.zip | |
CONSOLE: Fix PS3 build.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 86b8b4fa..3f733c59 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -214,7 +214,7 @@ TARGET_XCFLAGS= $(TARGET_LFSFLAGS) -U_FORTIFY_SOURCE | |||
| 214 | TARGET_XLDFLAGS= | 214 | TARGET_XLDFLAGS= |
| 215 | TARGET_XLIBS= -lm | 215 | TARGET_XLIBS= -lm |
| 216 | TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS) | 216 | TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS) |
| 217 | TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_ARCH) $(TARGET_FLAGS) $(TARGET_CFLAGS) | 217 | TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS) |
| 218 | TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS) | 218 | TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS) |
| 219 | TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) | 219 | TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) |
| 220 | TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) | 220 | TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) |
| @@ -249,6 +249,15 @@ endif | |||
| 249 | endif | 249 | endif |
| 250 | endif | 250 | endif |
| 251 | 251 | ||
| 252 | ifneq (,$(findstring __CELLOS_LV2__ ,$(TARGET_TESTARCH))) | ||
| 253 | TARGET_SYS= PS3 | ||
| 254 | TARGET_ARCH+= -D__CELLOS_LV2__ | ||
| 255 | TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC | ||
| 256 | endif | ||
| 257 | ifneq (,$(findstring LJ_NO_UNWIND ,$(TARGET_TESTARCH))) | ||
| 258 | TARGET_ARCH+= -DLUAJIT_NO_UNWIND | ||
| 259 | endif | ||
| 260 | |||
| 252 | TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) | 261 | TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) |
| 253 | TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH)) | 262 | TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH)) |
| 254 | 263 | ||
| @@ -277,7 +286,7 @@ ifeq (Windows,$(HOST_SYS)) | |||
| 277 | HOST_RM= del | 286 | HOST_RM= del |
| 278 | endif | 287 | endif |
| 279 | 288 | ||
| 280 | TARGET_SYS= $(HOST_SYS) | 289 | TARGET_SYS?= $(HOST_SYS) |
| 281 | ifeq (Windows,$(TARGET_SYS)) | 290 | ifeq (Windows,$(TARGET_SYS)) |
| 282 | TARGET_STRIP+= --strip-unneeded | 291 | TARGET_STRIP+= --strip-unneeded |
| 283 | TARGET_XSHLDFLAGS= -shared | 292 | TARGET_XSHLDFLAGS= -shared |
| @@ -310,7 +319,9 @@ else | |||
| 310 | TARGET_XCFLAGS+= -fno-stack-protector | 319 | TARGET_XCFLAGS+= -fno-stack-protector |
| 311 | endif | 320 | endif |
| 312 | ifneq (SunOS,$(TARGET_SYS)) | 321 | ifneq (SunOS,$(TARGET_SYS)) |
| 313 | TARGET_XLDFLAGS+= -Wl,-E | 322 | ifneq (PS3,$(TARGET_SYS)) |
| 323 | TARGET_XLDFLAGS+= -Wl,-E | ||
| 324 | endif | ||
| 314 | endif | 325 | endif |
| 315 | ifeq (Linux,$(TARGET_SYS)) | 326 | ifeq (Linux,$(TARGET_SYS)) |
| 316 | TARGET_XLIBS+= -ldl | 327 | TARGET_XLIBS+= -ldl |
| @@ -463,6 +474,9 @@ endif | |||
| 463 | ifeq (SunOS,$(TARGET_SYS)) | 474 | ifeq (SunOS,$(TARGET_SYS)) |
| 464 | BUILDMODE= static | 475 | BUILDMODE= static |
| 465 | endif | 476 | endif |
| 477 | ifeq (PS3,$(TARGET_SYS)) | ||
| 478 | BUILDMODE= static | ||
| 479 | endif | ||
| 466 | 480 | ||
| 467 | ifeq (static,$(BUILDMODE)) | 481 | ifeq (static,$(BUILDMODE)) |
| 468 | TARGET_DYNCC= @: | 482 | TARGET_DYNCC= @: |
