General fixes

PC/Makefile

@@ -6,7 +6,7 @@ SDIR	:=	source
 IDIR	:=	include
 LDIR	:=	lib
 CFLAGS	:=	-I$(IDIR) -fms-extensions -O2 -Wall
-LFLAGS	:=	-L$(LDIR) -lvJoyInterface -lws2_32 -lGdi32 -lgdiplus -static-libgcc -static-libstdc++
+LFLAGS	:=	$(LDIR)/vJoyInterface.lib -lws2_32 -lGdi32 -lgdiplus -static-libgcc
 CFILES	:=	$(wildcard $(SDIR)/*.c)
 CPPFILES	:=	$(wildcard $(SDIR)/*.cpp)
 OBJS	:=	$(patsubst $(SDIR)/%.c, build/%.o, $(wildcard $(SDIR)/*.c))

PC/include/keys.h

@@ -15,7 +15,9 @@
 #define KEYEVENTF_SCANCODE 0x08
 #endif
 
+#ifndef MAPVK_VK_TO_VSC
 #define MAPVK_VK_TO_VSC 0
+#endif
 
 #define newpress(key) ((currentKeys & key) && !(lastKeys & key))
 #define release(key) (!(currentKeys & key) && (lastKeys & key))

PC/source/main.c

@@ -12,7 +12,6 @@
 #include "joystick.h"
 #include "settings.h"
 #include "keyboard.h"
-#include "screenshot.h"
 
 int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmd, int nShow) {
 	printf("3DS Controller Server %.1f\n", VERSION);
@@ -23,8 +22,6 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmd, int nShow)
 	double widthMultiplier = screenWidth / 320.0;
 	double heightMultiplier = screenHeight / 240.0;
 
-	//screenshot(SCREENSHOT_NAMEL, TRUE, 0, 0, 18);
-
 	bool vJoy = true;
 	UINT iInterface = 1;
 
@@ -221,8 +218,6 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmd, int nShow)
 		}
 
 		if(vJoy) updateJoystick();
-
-		//sendScreenshot();
 	}
 
 	error("accept()");

PC/source/wireless.c

@@ -3,7 +3,6 @@
 #include "general.h"
 
 #include "settings.h"
-#include "screenshot.h"
 
 #include "wireless.h"
 
@@ -79,24 +78,3 @@ void sendBuffer(int length) {
 int receiveBuffer(int length) {
 	return recvfrom(listener, (char *)&buffer, length, 0, (struct sockaddr *)&client_in, &sockaddr_in_sizePtr);
 }
-
-void sendScreenshot(void) {
-	FILE *f = fopen(SCREENSHOT_NAME, "rb");
-	fseek(f, 0, SEEK_END);
-	size_t len = ftell(f);
-	unsigned char *screenshotData = malloc(len);
-	rewind(f);
-	fread(screenshotData, len, 1, f);
-	fclose(f);
-
-	buffer.command = SCREENSHOT;
-
-	while(1) {
-		int tl = len - buffer.offset > SCREENSHOT_CHUNK ? SCREENSHOT_CHUNK : len - buffer.offset;
-		memcpy(buffer.data, screenshotData + buffer.offset, tl);
-		sendBuffer(tl + offsetof(struct packet, screenshotPacket));
-		if(tl < SCREENSHOT_CHUNK) break;
-	}
-
-	free(screenshotData);
-}