Update to last vitasdk

Author: psxdev

README.md

@@ -13,17 +13,7 @@ DEBUGNET FOR VITA
 
  1) Compile and install library and include file
 
-  You need the new vita toolchain installed in your environment VITASDK must be defined.
 
-  Experimental build scripts tested with osx are in:
-  
-  [vitasdk-buildscripts] (https://github.com/psxdev/vitasdk-buildscripts)
-  
-  After install it replace crt0.o from arm-vita-eabi/lib with this one than you has in  build-native/newlib/arm-vita-eabi/newlib/libc/sys/vita/crt0.o is inside of directory that you are using to compiling the toolchain
-  
-  Toolchain is work in progress but it's time to switch to vitasdk 
-  
-    
   ```
   cd libdebugnet
   make
@@ -62,15 +52,20 @@ DEBUGNET FOR VITA
  ```
 
  5) ready to have a lot of fun :P and switch to vitasdk
-  
+
+===========================
+  Change log
+===========================
+ 21/01/2016 Update to support last vitasdk 
+ 
 ===========================
   Credits
 ===========================
 
   Special thanks goes to:
 
   - yifanlu to open the doors with rejuvenate. 
-  - All people who collaborated in #PSP2SDK: @17310, @xerpi(i stole you network initialization code :P from FTPVita), @frangar , @frtomtomdu80, @hykemthedemon , @SMOKE587, @Josh_Axey ... 
+  - All people who collaborated in #PSP2SDK: @173210, @xerpi(i stole you network initialization code :P from FTPVita), @frangar , @frtomtomdu80, @hykemthedemon , @SMOKE587, @Josh_Axey ... 
   - All ps3dev and ps2dev old comrades
   - xyzz for help with vita toolchain
 

libdebugnet/source/debugnet.c

@@ -120,7 +120,7 @@ int debugNetInit(char *serverIp, int port, int level)
     }
     /*net initialazation code from xerpi at https://github.com/xerpi/FTPVita/blob/master/ftp.c*/
     /* Init Net */
-    if (sceNetShowNetstat() == PSP2_NET_ERROR_ENOTINIT) {
+    if (sceNetShowNetstat() == SCE_NET_ERROR_ENOTINIT) {
         net_memory = malloc(NET_INIT_SIZE);
 
         initparam.memory = net_memory;
@@ -139,23 +139,23 @@ int debugNetInit(char *serverIp, int port, int level)
 
 
     /* Get IP address */
-    ret = sceNetCtlInetGetInfo(PSP2_NETCTL_INFO_GET_IP_ADDRESS, &info);
+    ret = sceNetCtlInetGetInfo(SCE_NETCTL_INFO_GET_IP_ADDRESS, &info);
     //printf("sceNetCtlInetGetInfo(): 0x%08X\n", ret);
 
 
     /* Save the IP of PSVita to a global variable */
-    sceNetInetPton(PSP2_NET_AF_INET, info.ip_address, &vita_addr);
+    sceNetInetPton(SCE_NET_AF_INET, info.ip_address, &vita_addr);
 
 	/* Create datagram udp socket*/
     SocketFD = sceNetSocket("debugnet_socket",
-        PSP2_NET_AF_INET , PSP2_NET_SOCK_DGRAM, PSP2_NET_IPPROTO_UDP);
+        SCE_NET_AF_INET , SCE_NET_SOCK_DGRAM, SCE_NET_IPPROTO_UDP);
 
     memset(&stSockAddr, 0, sizeof stSockAddr);
 
 	/*Populate SceNetSockaddrIn structure values*/
-    stSockAddr.sin_family = PSP2_NET_AF_INET;
+    stSockAddr.sin_family = SCE_NET_AF_INET;
     stSockAddr.sin_port = sceNetHtons(port);
-    sceNetInetPton(PSP2_NET_AF_INET, serverIp, &stSockAddr.sin_addr);
+    sceNetInetPton(SCE_NET_AF_INET, serverIp, &stSockAddr.sin_addr);
 
 	/*Connect socket to server*/
     sceNetConnect(SocketFD, (struct SceNetSockaddr *)&stSockAddr, sizeof stSockAddr);

sample/Makefile

@@ -12,27 +12,19 @@ OBJS= main.o
 
 LIBS=-ldebugnet -lSceNet_stub -lSceNetCtl_stub 
 
-PREFIX   = arm-vita-eabi
-AS	     = $(PREFIX)-as
-CC       = $(PREFIX)-gcc
-CXX		 = $(PREFIX)-g++
-READELF  = $(PREFIX)-readelf
-OBJDUMP  = $(PREFIX)-objdump
-CFLAGS   = -Wl,-q  $(DEFINES) $(INCDIR) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections
-CXXFLAGS = $(CFLAGS) -fno-unwind-tables -fno-rtti -fno-exceptions -Wno-deprecated -Wno-comment -Wno-sequence-point
-ASFLAGS  = $(CFLAGS) --gc-sections
+PREFIX  = arm-vita-eabi
+CC      = $(PREFIX)-gcc
+CFLAGS  = -Wl,-q -Wall -O3
+ASFLAGS = $(CFLAGS)
 
 all: $(TARGET).velf
 
-$(TARGET).velf: $(TARGET).elf
-#advice from xyzz strip before create elf
-	arm-vita-eabi-strip -g $<
-#i put db.json there use your location 
-	vita-elf-create  $< $@ $(VITASDK)/bin/db.json
+%.velf: %.elf
+	$(PREFIX)-strip -g $<
+	vita-elf-create $< $@
 
 $(TARGET).elf: $(OBJS)
-	$(CC)   $^  $(CFLAGS) $(LIBS) -o $@ 
+	$(CC) $(CFLAGS) $^ $(LIBS) -o $@
 
 clean:
-	@rm -rf $(TARGET).elf $(TARGET).velf $(OBJS) $(DATA)/*.h
-		
+	@rm -rf $(TARGET).velf $(TARGET).elf $(OBJS)