Skip to content

Commit

Permalink
Windows Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
APGRoboCop committed Mar 30, 2020
1 parent 67d7053 commit f8ee1e1
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 25 deletions.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,23 @@ metamod/api_hook.PVS-Studio.i
metamod/Debug/metamod.log
metamod/Debug/metamod.Build.CppClean.log
metamod/Debug/metamod.vcxproj.FileListAbsolute.txt
metamod/linkplug.cpp.PVS-Studio.cfg
metamod/linkplug.cpp.PVS-Studio.cmd
metamod/linkplug.cpp.PVS-Studio.preprocess.cmd.rsp
metamod/linkplug.PVS-Studio.i
metamod/Release/metamod.exp
metamod/Release/metamod.iobj
metamod/Release/metamod.ipdb
metamod/Release/metamod.lib
metamod/Release/res_meta.res
*.dll
metamod/commands_meta.cpp.PVS-Studio.cfg
metamod/commands_meta.cpp.PVS-Studio.cmd
metamod/commands_meta.cpp.PVS-Studio.preprocess.cmd
metamod/commands_meta.cpp.PVS-Studio.preprocess.cmd.rsp
metamod/commands_meta.PVS-Studio.i
metamod/engine_api.cpp.PVS-Studio.cfg
metamod/engine_api.cpp.PVS-Studio.cmd
metamod/engine_api.cpp.PVS-Studio.preprocess.cmd
metamod/engine_api.cpp.PVS-Studio.preprocess.cmd.rsp
metamod/engine_api.PVS-Studio.i
20 changes: 0 additions & 20 deletions metamod/Backup/metamod.sln

This file was deleted.

4 changes: 1 addition & 3 deletions metamod/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ DLLS_DIR=../dlls
SDKSRC=../hlsdk
METADIR=../metamod

COMPILE_TZ=EET
COMPILE_TZ=GMT
## Developer overrides
ifeq "$(USER)" "jussi"
COMPILE_TZ=EET
Expand Down Expand Up @@ -198,8 +198,6 @@ CFLAGS=-Wall -Wno-unknown-pragmas -Wno-attributes -Wno-write-strings

#CFLAGS+=-std=gnu++98 -Wno-c++11-compat

CFLAGS+=-std=gnu++11 -Wno-c++11-compat

#CFLAGS += -DTEST

ifeq "$(OPT)" "opt-fast"
Expand Down
2 changes: 1 addition & 1 deletion metamod/osdep.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
// DLL.
#undef DLLEXPORT
#ifdef _WIN32
#define DLLEXPORT __declspec(dllexport) __attribute__ ((externally_visible))
#define DLLEXPORT __declspec(dllexport)
// WINAPI should be provided in the windows compiler headers.
// It's usually defined to something like "__stdcall".
#elif defined(linux)
Expand Down
2 changes: 1 addition & 1 deletion metamod/vers_meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#endif /* not OPT_TYPE */


#define VDATE "2020/03/22"
#define VDATE "2020/03/30"
#define VPATCH_COPYRIGHT_YEAR "2020"
#define VMETA_VERSION "1.21"

Expand Down

0 comments on commit f8ee1e1

Please sign in to comment.