backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

fix build on linux

Browse Source
This commit is contained in:
FunkyFr3sh 2024-12-06 05:58:32 +01:00
parent 411f043827
commit 0a7f877c8f
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -4,30 +4,7 @@ TARGET ?= ddraw.dll
LDFLAGS ?= -Wl,--enable-stdcall-fixup -s -static -shared LDFLAGS ?= -Wl,--enable-stdcall-fixup -s -static -shared
CFLAGS ?= -Iinc -O2 -Wall -std=c99 -Wno-incompatible-pointer-types CFLAGS ?= -Iinc -O2 -Wall -std=c99 -Wno-incompatible-pointer-types
LIBS = -lgdi32 -lwinmm -lole32 -lMsimg32 -lPsapi LIBS = -lgdi32 -lwinmm -lole32 -lmsimg32 -lpsapi
COMMIT := $(shell git describe --match=NeVeRmAtCh --always --dirty || echo UNKNOWN)
BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo UNKNOWN)
ECHOTEST := $(shell echo \"\")
ifeq ($(ECHOTEST),\"\")
# Windows
HASH := \#
ECOMMIT := $(shell echo $(HASH)define GIT_COMMIT "$(COMMIT)" > inc/git.h)
EBRANCH := $(shell echo $(HASH)define GIT_BRANCH "$(BRANCH)" >> inc/git.h)
else
# Either *nix or Windows with BusyBox (e.g. w64devkit)
ECOMMIT := $(shell echo "#define GIT_COMMIT" \"$(COMMIT)\" > inc/git.h)
EBRANCH := $(shell echo "#define GIT_BRANCH" \"$(BRANCH)\" >> inc/git.h)
endif
ifdef DEBUG
CFLAGS += -D _DEBUG -D _DEBUG_X
endif
ifdef _WIN32_WINNT
CFLAGS += -march=i486 -D _WIN32_WINNT=$(_WIN32_WINNT)
endif
CC = i686-w64-mingw32-gcc CC = i686-w64-mingw32-gcc
WINDRES ?= i686-w64-mingw32-windres WINDRES ?= i686-w64-mingw32-windres

2
src/render_d3d9.c
View File

@ -10,7 +10,7 @@
#include "wndproc.h" #include "wndproc.h"
#include "blt.h" #include "blt.h"
#include "debug.h" #include "debug.h"
#include "D3d9types.h" #include "d3d9types.h"
#include "hook.h" #include "hook.h"
#include "config.h" #include "config.h"