Skip to content

Feature/externalize stub library build #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature/externalize stub library build #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98f804a
Remove unused Ps4SdkFlags from PIC make trait
hitodama Oct 6, 2017
90e9ac2
Add stub-lib target
hitodama Oct 6, 2017
5955dbe
Switch core Makefile to new ps4_stub_lib target
hitodama Oct 6, 2017
0580354
Change Makefiles to set Ps4Sdk to the parent directory
hitodama Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
ifndef Ps4Sdk
ifdef ps4sdk
Ps4Sdk := $(ps4sdk)
endif
ifdef PS4SDK
Ps4Sdk := $(PS4SDK)
endif
ifndef Ps4Sdk
$(error Neither PS4SDK, Ps4Sdk nor ps4sdk set)
endif
endif
###################################

Ps4Sdk ?= $(CURDIR)/..

target ?= ps4_lib_no_all
BuildPath := $(Ps4Sdk)/build
OutPath := $(Ps4Sdk)/lib

###################################

include $(Ps4Sdk)/make/ps4sdk.mk

###################################

define generateCObject
$(patsubst %,$(BuildPath)/%,$(patsubst %.c,%.o,$(1))): $(1)
$$(dirp)
Expand Down
18 changes: 7 additions & 11 deletions common/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
ifndef Ps4Sdk
ifdef ps4sdk
Ps4Sdk := $(ps4sdk)
endif
ifdef PS4SDK
Ps4Sdk := $(PS4SDK)
endif
ifndef Ps4Sdk
$(error Neither PS4SDK, Ps4Sdk nor ps4sdk set)
endif
endif
###################################

Ps4Sdk ?= $(CURDIR)/..

target ?= ps4_lib_no_all
BuildPath := $(Ps4Sdk)/build
OutPath := $(Ps4Sdk)/lib

###################################

include $(Ps4Sdk)/make/ps4sdk.mk

###################################

define generateCObject
$(patsubst %,$(BuildPath)/%,$(patsubst %.c,%.c.o,$(1))): $(1)
$$(dirp)
Expand Down
62 changes: 1 addition & 61 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,14 @@

Ps4Sdk ?= $(CURDIR)/..

target := ps4_lib_no_all
target := ps4_stub_lib
BuildPath := $(Ps4Sdk)/build
OutPath := $(Ps4Sdk)/lib

###################################

ifndef Ps4SdkFlags
ifdef ps4sdkflags
Ps4SdkFlags := $(ps4sdkflags)
endif
ifdef PS4SDKCFLAGS
Ps4SdkFlags := $(PS4SDKCFLAGS)
endif
endif

###################################

include $(Ps4Sdk)/make/ps4sdk.mk

archive2 = $(Archiver) $(ArchiverFlags)

#dirp = @mkdir -p $(@D)
#archive := $(Archiver) $(ArchiverFlags)

#generateObject <type> <lib> <module> <symbol>
define generateObject
$(BuildPath)/$(strip $(2))/$(strip $(4)).stub.o: stub/$(strip $(1)).stub.c
ifeq ("$(wildcard $$@)", "")
@mkdir -p $$@
@rmdir $$@
endif
@$$(compile) -DPS4_STUB_MODULE="$(strip $(3))" -DPS4_STUB_SYMBOL="$(strip $(4))"

endef

#generateLibrary <type> <lib> <module> <symbols> <extobj>
define generateLibrary
$(foreach i, $(4), $(call generateObject, $(1), $(2), $(3), $(i)))
$(OutPath)/$(strip $(2))_stub.a: $(5) $(patsubst %,$(BuildPath)/$(strip $(2))/%.stub.o,$(strip $(4)))
$$(dirp)
$$(archive)
all:: $(OutPath)/$(strip $(2))_stub.a
clean::
rm -fR $(BuildPath)/$(strip $(2)) $(OutPath)/$(strip $(2))_stub.a

endef

#generateLibrary <type> <lib> <module> <symbols> <extobj>
define generateLibraryLarge
$(foreach i, $(4), $(call generateObject, $(1), $(2), $(3), $(i)))
$(OutPath)/$(strip $(2))_stub.a: $(5) $(patsubst %,$(BuildPath)/$(strip $(2))/%.stub.o,$(strip $(4)))
$$(dirp)
find $$(BuildPath)/$$(strip $(2)) -name *.o > /tmp/ps4sdk_$$(strip $(2))_object.tmp
xargs $$(archive2) $$(OutPath)/$$(strip $(2))_stub.a < /tmp/ps4sdk_$$(strip $(2))_object.tmp
rm -rf /tmp/ps4sdk_$$(strip $(2))_object.tmp
all:: $(OutPath)/$(strip $(2))_stub.a
clean::
rm -fR $(BuildPath)/$(strip $(2)) $(OutPath)/$(strip $(2))_stub.a

endef

#generateModule <module> <symbols>
define generateModule
$(call generateObject, module, $(1), $(1), $(1))
$(call generateLibrary, function, $(1), $(1), $(2), $(BuildPath)/$(strip $(1))/$(strip $(1)).stub.o)

endef

include $(CURDIR)/stub.mk

###################################
18 changes: 7 additions & 11 deletions extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
ifndef Ps4Sdk
ifdef ps4sdk
Ps4Sdk := $(ps4sdk)
endif
ifdef PS4SDK
Ps4Sdk := $(PS4SDK)
endif
ifndef Ps4Sdk
$(error Neither PS4SDK, Ps4Sdk nor ps4sdk set)
endif
endif
###################################

Ps4Sdk ?= $(CURDIR)/..

target ?= ps4_lib_no_all
BuildPath := $(Ps4Sdk)/build
OutPath := $(Ps4Sdk)/lib
IncludePath := -I$(wildcard */*/include) #FIXME: Need to gen correctly

###################################

include $(Ps4Sdk)/make/ps4sdk.mk

###################################

define generateCObject
$(patsubst %,$(BuildPath)/%,$(patsubst %.c,%.o,$(1))): $(1)
$$(dirp)
Expand Down
60 changes: 60 additions & 0 deletions make/target/ps4_stub_lib.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
###################################

include $(MakePath)/trait/freestanding.mk
include $(MakePath)/trait/ps4.mk
include $(MakePath)/trait/pic.mk

###################################

CompilerFlags += -I $(Ps4Sdk)/core/include

###################################

archive2 = $(Archiver) $(ArchiverFlags)

#dirp = @mkdir -p $(@D)
#archive := $(Archiver) $(ArchiverFlags)

#generateObject <type> <lib> <module> <symbol>
define generateObject
$(BuildPath)/$(strip $(2))/$(strip $(4)).stub.o: $(Ps4Sdk)/core/stub/$(strip $(1)).stub.c
ifeq ("$(wildcard $$@)", "")
@mkdir -p $$@
@rmdir $$@
endif
@$$(compile) -DPS4_STUB_MODULE="$(strip $(3))" -DPS4_STUB_SYMBOL="$(strip $(4))"

endef

#generateLibrary <type> <lib> <module> <symbols> <extobj>
define generateLibrary
$(foreach i, $(4), $(call generateObject, $(1), $(2), $(3), $(i)))
$(OutPath)/$(strip $(2))_stub.a: $(5) $(patsubst %,$(BuildPath)/$(strip $(2))/%.stub.o,$(strip $(4)))
$$(dirp)
$$(archive)
all:: $(OutPath)/$(strip $(2))_stub.a
clean::
rm -fR $(BuildPath)/$(strip $(2)) $(OutPath)/$(strip $(2))_stub.a

endef

#generateLibrary <type> <lib> <module> <symbols> <extobj>
define generateLibraryLarge
$(foreach i, $(4), $(call generateObject, $(1), $(2), $(3), $(i)))
$(OutPath)/$(strip $(2))_stub.a: $(5) $(patsubst %,$(BuildPath)/$(strip $(2))/%.stub.o,$(strip $(4)))
$$(dirp)
find $$(BuildPath)/$$(strip $(2)) -name *.o > /tmp/ps4sdk_$$(strip $(2))_object.tmp
xargs $$(archive2) $$(OutPath)/$$(strip $(2))_stub.a < /tmp/ps4sdk_$$(strip $(2))_object.tmp
rm -rf /tmp/ps4sdk_$$(strip $(2))_object.tmp
all:: $(OutPath)/$(strip $(2))_stub.a
clean::
rm -fR $(BuildPath)/$(strip $(2)) $(OutPath)/$(strip $(2))_stub.a

endef

#generateModule <module> <symbols>
define generateModule
$(call generateObject, module, $(1), $(1), $(1))
$(call generateLibrary, function, $(1), $(1), $(2), $(BuildPath)/$(strip $(1))/$(strip $(1)).stub.o)

endef
2 changes: 1 addition & 1 deletion make/trait/pic.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###################################

CompilerFlags += $(Ps4SdkFlags) -fPIC
CompilerFlags += -fPIC

###################################