X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fuiq3%2Fuiq3.mak;h=ddf2e8469be93659623f62fe1f15965ef5f49803;hb=76bc7a1d9af4b18f4d91221aef2bb9ea5b6132db;hp=6221f3f083fea1b76dc4a05184d591e6fd8fce71;hpb=ca482e5de8bacb70db55f43afe02f93fe6fe3f16;p=picodrive.git

diff --git a/platform/uiq3/uiq3.mak b/platform/uiq3/uiq3.mak
index 6221f3f..ddf2e84 100644
--- a/platform/uiq3/uiq3.mak
+++ b/platform/uiq3/uiq3.mak
@@ -35,10 +35,9 @@ ELF2E32 = elf2e32
 BMCONV = bmconv
 EPOCRC = EPOCROOT=$(EPOCROOT) epocrc
 
-PATH := $(EPOCROOT)/bin:$(GCCPATH)/bin:$(GCCPATH)/$(GCCPREF)/bin:$(PATH)
+PATH := $(EPOCROOT)/bin:$(GCCPATH)/bin:$(PATH)
 
-# TODO: do we really need -mapcs?
-# -march=armv5t
+# -march=armv5t ?
 CFLAGS += -Wall -pipe -nostdinc -msoft-float
 CFLAGS += -DNDEBUG -D_UNICODE -D__GCCE__  -D__SYMBIAN32__ -D__EPOC32__ -D__MARM__
 CFLAGS += -D__EABI__ -D__MARM_ARMV5__ -D__EXE__ -D__SUPPORT_CPP_EXCEPTIONS__ -D__MARM_ARMV5__
@@ -78,7 +77,7 @@ REGDIR ?= ../reg
 SRCH += $(shell echo ../inc/*.h)
 SRC += $(shell echo ../src/*.cpp)
 SRCRES ?= $(shell echo $(RSCDIR)/*.rss $(RSCDIR)/*.rls $(REGDIR)/*.rss $(REGDIR)/*.rls)
-OBJ ?= $(SRC:.cpp=.o)
+OBJS ?= $(SRC:.cpp=.o)
 
 .PHONY : all mbm icon_mbm rsc reg loc bin sis run
 
@@ -127,9 +126,9 @@ bin : bin_elf
 
 bin_elf : $(NAME).elf.exe
 
-$(NAME).elf.exe : $(OBJ) $(EXTRALIB)
+$(NAME).elf.exe : $(OBJS) $(EXTRALIB)
 	@echo "Linking..."
-	$(LD) $(LDFLAGS) $(OBJ) $(EXTRALIB) $(LDFLAGS2)
+	$(LD) $(LDFLAGS) $(OBJS) $(EXTRALIB) $(LDFLAGS2)
 
 .cpp.o :
 	@echo "Compiling $< ..."
@@ -158,7 +157,7 @@ run : sis
 	$(CXX) -M -DDEPS $(SRC) $(CXXFLAGS) >> $@
 
 clean :
-	rm -f $(NAME).exe $(NAME).elf.exe $(OBJ) tags .deps $(NAME).exe.map
+	rm -f $(NAME).exe $(NAME).elf.exe $(OBJS) tags .deps $(NAME).exe.map
 	rm -f *.bkp ../src/*.bkp ../inc/*.bkp $(RSCDIR)/*.bkp $(REGDIR)/*.bkp
 	rm -f $(RSCDIR)/*.rsc $(RSCDIR)/*.rsg
 	rm -f $(REGDIR)/*.rsc $(REGDIR)/*.rsg