zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 14:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

MinGW build fix

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1627 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2010-05-03 08:30:25 +00:00
parent b2baba827c
commit e665b96d1b
4 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
polymer/eduke32/Makefile
View file

@ -92,23 +92,24 @@ OURCFLAGS=$(debug) -W -Wall -Wimplicit -Werror-implicit-function-declaration \
-fjump-tables -fno-stack-protector -fjump-tables -fno-stack-protector
# -march=pentium3 -mtune=generic -mmmx -m3dnow -msse -mfpmath=sse # -march=pentium3 -mtune=generic -mmmx -m3dnow -msse -mfpmath=sse
OURCXXFLAGS=-fno-exceptions -fno-rtti OURCXXFLAGS=-fno-exceptions -fno-rtti
LIBS=-lm -ldl -pthread LIBS=-lm
NASMFLAGS = -s NASMFLAGS = -s
EXESUFFIX= EXESUFFIX=
include $(EROOT)/Makefile.shared include $(EROOT)/Makefile.shared
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
OBJ=obj_win OBJ=obj_win
EOBJ=eobj_win EOBJ=eobj_win
else else
ifeq (1,$(PROFILER)) LIBS+= -ldl -pthread
LIBS+= -lprofiler ifeq (1,$(PROFILER))
endif LIBS+= -lprofiler
OBJ=obj
EOBJ=eobj
endif endif
OBJ=obj
EOBJ=eobj
endif
JMACTOBJ=$(OBJ)/util_lib.$o \ JMACTOBJ=$(OBJ)/util_lib.$o \
$(OBJ)/file_lib.$o \ $(OBJ)/file_lib.$o \

7
polymer/eduke32/build/Makefile
View file

@ -114,7 +114,7 @@ OURCFLAGS=$(debug) -W -Wall -Wimplicit -Werror-implicit-function-declaration \
-fjump-tables -fno-stack-protector -fjump-tables -fno-stack-protector
# -march=pentium3 -mtune=generic -mmmx -m3dnow -msse -mfpmath=sse # -march=pentium3 -mtune=generic -mmmx -m3dnow -msse -mfpmath=sse
OURCXXFLAGS=-fno-exceptions -fno-rtti OURCXXFLAGS=-fno-exceptions -fno-rtti
LIBS=-pthread -ldl LIBS=
ASFLAGS=-s #-g ASFLAGS=-s #-g
EXESUFFIX= EXESUFFIX=
@ -125,6 +125,11 @@ ifeq (0,$(NOASM))
ENGINEOBJS+= $(OBJ)/a.$o ENGINEOBJS+= $(OBJ)/a.$o
endif endif
ifneq ($(PLATFORM),WINDOWS)
LIBS+= -ldl -pthread
endif
ENGINEOBJS+= \ ENGINEOBJS+= \
$(OBJ)/a-c.$o \ $(OBJ)/a-c.$o \
$(OBJ)/baselayer.$o \ $(OBJ)/baselayer.$o \

8
polymer/eduke32/build/include/rawinput.h
View file

@ -11,10 +11,18 @@ int8_t RI_WheelState();
int32_t RI_CaptureInput(int32_t grab, HWND target); int32_t RI_CaptureInput(int32_t grab, HWND target);
#ifndef VK_LBUTTON
#define VK_LBUTTON 0x01 #define VK_LBUTTON 0x01
#endif
#ifndef VK_RBUTTON
#define VK_RBUTTON 0x02 #define VK_RBUTTON 0x02
#endif
#ifndef VK_CANCEL
#define VK_CANCEL 0x03 #define VK_CANCEL 0x03
#endif
#ifndef VK_MBUTTON
#define VK_MBUTTON 0x04 /* NOT contiguous with L & RBUTTON */ #define VK_MBUTTON 0x04 /* NOT contiguous with L & RBUTTON */
#endif
// mouse states for RI_MouseState // mouse states for RI_MouseState

5
polymer/eduke32/build/src/rawinput.c
View file

@ -14,12 +14,17 @@ static int8_t MWheel = 0;
extern volatile uint8_t moustat, mousegrab; extern volatile uint8_t moustat, mousegrab;
extern uint32_t mousewheel[2]; extern uint32_t mousewheel[2];
extern void SetKey(int32_t key, int32_t state);
#define MASK_DOWN (1<<(i<<1)) #define MASK_DOWN (1<<(i<<1))
#define MASK_UP (MASK_DOWN<<1) #define MASK_UP (MASK_DOWN<<1)
#define MouseWheelFakePressTime 50 #define MouseWheelFakePressTime 50
#ifndef GET_RAWINPUT_CODE_WPARAM
#define GET_RAWINPUT_CODE_WPARAM(wParam) ((wParam) & 0xff)
#endif
void RI_ProcessMouse(const RAWMOUSE* rmouse) void RI_ProcessMouse(const RAWMOUSE* rmouse)
{ {
int32_t i, mask; int32_t i, mask;