diff --git a/samples/0_Intro/square/Makefile b/samples/0_Intro/square/Makefile
index a1e2464160..9bb0dd8205 100644
--- a/samples/0_Intro/square/Makefile
+++ b/samples/0_Intro/square/Makefile
@@ -1,17 +1,24 @@
 HIP_PATH?= $(wildcard /opt/rocm/hip)
+ifeq (,$(HIP_PATH))
+	HIP_PATH=../../..
+endif
+HIP_PLATFORM=$(shell $(HIP_PATH)/bin/hipconfig --platform)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
+ifeq (${HIP_PLATFORM}, nvcc)
+	SOURCES=square.cu
+else
+	SOURCES=square.cpp
+endif
+
 all: square.out
 
 # Step
-square.cpp:
+square.cpp: square.cu
 	$(HIP_PATH)/bin/hipify-perl square.cu > square.cpp
 
-square.out: square.cpp
-	$(HIPCC) $(CXXFLAGS) square.cpp -o $@
+square.out: $(SOURCES)
+	$(HIPCC) $(CXXFLAGS) $(SOURCES) -o $@
 
-# make step to make native cuda app, if on cuda machine
-square.cuda.out : square.cu
-	nvcc square.cu -o $@
 clean:
-	rm -f *.o *.out	
+	rm -f *.o *.out square.cpp