Begining to add support for SDL2

Makefile

@@ -5,13 +5,21 @@ NASM=nasm
 
 ifeq ($(DEBUG), 0)
 	ASFLAGS=-felf64
-	LDFLAGS=-s -melf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -lSDL
+	LDFLAGS=-s -melf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2
 	#LDFLAGS=-s -melf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -lSDL2
 else
 	ASFLAGS=-felf64 -g -F dwarf -l $(TARGET).lst
 	#LDFLAGS=-g -melf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -lSDL
-	LDFLAGS=-g -melf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -lSDL2
+	LDFLAGS=-g -melf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2
 endif
+ifeq ($(SDL), 2)
+	LDFLAGS += -lSDL2
+	ASFLAGS += -DSDL2=1
+else
+	LDFLAGS += -lSDL
+	ASFLAGS += -DSDL1=1
+endif
+
 
 OBJ=$(TARGET).o
 SRC=$(TARGET).asm

sdl.asm

@@ -8,8 +8,16 @@ Extern SDL_PauseAudio
 Extern SDL_WaitEvent
 Extern SDL_GetError
 
+;Extern SDL_QUIT
+;Extern SDL_AUDIODEVICEADDED
 
-%define SDL_QuitEvent 0x0C
+%ifdef SDL1
+	%define SDL_QUIT 0x0C
+%endif
+%ifdef SDL2
+	%define SDL_QUIT 0x100
+	%define SDL_AUDIODEVICEADDED 0x1100
+%endif
 
 %define SDL_SWSURFACE 0
 

yaglitch.asm

@@ -89,7 +89,12 @@ section .bss
 	; audiospec returned from SDL
 	audiospec_recv: resb 32
 	; Event receveid from SDL
-	event: resb 24
+	%ifdef SDL1
+		event: resb 24
+	%endif
+	%ifdef SDL 2
+		event: resb 56
+	%endif
 
 section .text
 global _start
@@ -344,7 +349,7 @@ sdl_init:
 	mov rdi, audiospec_wanted
 	mov rsi, audiospec_recv
 	call SDL_OpenAudio
-
+dbginit:
 	; 256*256 window
 	;mov rdi, 256
 	;mov rsi, 255
@@ -353,10 +358,12 @@ sdl_init:
 	;xor rcx, rcx
 	;call SDL_SetVideoMode
 
-audio_start:
-	;start audio
-	xor rdi, rdi
-	call SDL_PauseAudio
+%ifdef SDL1
+	audio_start:
+		;start audio
+		xor rdi, rdi
+		call SDL_PauseAudio
+%endif
 
 loop_event:
 	xor rdi, rdi
@@ -366,19 +373,35 @@ loop_event:
 	cmp rax, 0
 	je sdl_error ; error fetching event...
 	xor rdi, rdi
-	mov di, [event]
-
-dbg:
-	;mov rsi, 1
-	;push rdi
-	;call print_hnum
-	;pop rdi
-
-	test di, SDL_QuitEvent
-	jnz exit
+%ifdef SDL1
+		mov di, [event]
+
+	dbg:
+		;mov rsi, 1
+		;push rdi
+		;call print_hnum
+		;pop rdi
+
+		test di, SDL_QUIT
+		jnz exit
+%endif
+%ifdef SDL2
+		mov edi, [event]
+		cmp edi, SDL_AUDIODEVICEADDED
+		je sdl2_audiostart
+		cmp edi, SDL_QUIT
+		je exit
+%endif
 
 	jmp loop_event
 
+%ifdef SDL2
+	sdl2_audiostart:
+		xor rdi, rdi
+		call SDL_PauseAudio
+		jmp loop_event
+%endif
+
 sdl_error:
 	; display error & exit
 	call SDL_GetError
@@ -596,6 +619,7 @@ audio_cllbck:
 		pop rcx
 		inc dword [t]
 		loop .loop
+dbg0:
 	ret
 
 run_glitch: