len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: instead of 'ifdef NODEPS' use 'ifneq ($NODEPS,)'

Browse source 
This way we can set NODEPS from within the makefiles, allowing
the fontzip to be buildable by itself again

Change-Id: Icc4022fef3805b39a97b7bc5d42719ee6522afd1
This commit is contained in:
Solomon Peachy 2025-03-29 14:33:20 -04:00
parent 2d4def6fd9
commit 25f3ba5db4
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/.externalToolBuilders/make libs.launch
View file

@ -6,7 +6,7 @@
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="libs NODEPS=''"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="libs NODEPS=1"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Rockbox}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Rockbox}"/>
</launchConfiguration> </launchConfiguration>

2
android/android.make
View file

@ -147,7 +147,7 @@ $(KEYSTORE):
-sigalg MD5withRSA -keyalg RSA -keysize 1024 \ -sigalg MD5withRSA -keyalg RSA -keysize 1024 \
-dname "CN=Android Debug,O=Android,C=US" -dname "CN=Android Debug,O=Android,C=US"
ifdef NODEPS ifneq ($(NODEPS),,)
$(APK): $(TEMP_APK) $(KEYSTORE) $(APK): $(TEMP_APK) $(KEYSTORE)
else else
$(APK): $(TEMP_APK) $(BUILDDIR)/rockbox.zip $(KEYSTORE) $(APK): $(TEMP_APK) $(BUILDDIR)/rockbox.zip $(KEYSTORE)

8
tools/root.make
View file

@ -320,10 +320,12 @@ tar: $(BUILDDIR)/rockbox.tar
fontzip: BUILDZIPOPTS=-f 1 fontzip: BUILDZIPOPTS=-f 1
fontzip: ZIPFILESUFFIX=-fonts fontzip: ZIPFILESUFFIX=-fonts
fontzip: NODEPS=1
fontzip: zip fontzip: zip
font7zip: BUILDZIPOPTS=-f 1 font7zip: BUILDZIPOPTS=-f 1
font7zip: ZIPFILESUFFIX=-fonts font7zip: ZIPFILESUFFIX=-fonts
font7zip: NODEPS=1
font7zip: 7zip font7zip: 7zip
fullzip: BUILDZIPOPTS=-f 2 fullzip: BUILDZIPOPTS=-f 2
@ -338,7 +340,7 @@ fulltar: BUILDZIPOPTS=-f 2
fulltar: ZIPFILESUFFIX=-full fulltar: ZIPFILESUFFIX=-full
fulltar: tar fulltar: tar
ifdef NODEPS ifneq ($(NODEPS),,)
$(BUILDDIR)/rockbox.zip: $(BUILDDIR)/rockbox.zip:
else else
$(BUILDDIR)/rockbox.zip: build $(BUILDDIR)/rockbox.zip: build
@ -352,7 +354,7 @@ mapzip:
elfzip: elfzip:
$(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip $(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip
ifdef NODEPS ifneq ($(NODEPS),,)
$(BUILDDIR)/rockbox.7z: $(BUILDDIR)/rockbox.7z:
else else
$(BUILDDIR)/rockbox.7z: build $(BUILDDIR)/rockbox.7z: build
@ -360,7 +362,7 @@ endif
$(call PRINTS,7Z rockbox$(ZIPFILESUFFIX).7z) $(call PRINTS,7Z rockbox$(ZIPFILESUFFIX).7z)
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o $(BUILDDIR)/rockbox$(ZIPFILESUFFIX).7z -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(BUILDZIPOPTS) $(TARGET) $(BINARY) $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o $(BUILDDIR)/rockbox$(ZIPFILESUFFIX).7z -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(BUILDZIPOPTS) $(TARGET) $(BINARY)
ifdef NODEPS ifneq ($(NODEPS),,)
$(BUILDDIR)/rockbox.tar: $(BUILDDIR)/rockbox.tar:
else else
$(BUILDDIR)/rockbox.tar: build $(BUILDDIR)/rockbox.tar: build