mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mattn-win32'

Browse Source
This commit is contained in:
vurtun 2015-11-26 18:32:07 +01:00
commit 4b2588a7c1
9 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
demo/glfw/Makefile
View File

@ -11,6 +11,13 @@ CFLAGS = -std=c89 -pedantic
SRC = ../../zahnrad.c glfw.c SRC = ../../zahnrad.c glfw.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe
LIBS = -lglfw3 -lopengl32 -lm -lGLU32 -lGLEW32
else
LIBS = -lglfw -lGL -lm -lGLU -lGLEW
endif
# Modes # Modes
.PHONY: clang .PHONY: clang
clang: CC = clang clang: CC = clang
@ -23,4 +30,4 @@ gcc: $(BIN)
$(BIN): $(BIN):
@mkdir -p bin @mkdir -p bin
rm -f bin/$(BIN) $(OBJS) rm -f bin/$(BIN) $(OBJS)
$(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) -lglfw -lGL -lm -lGLU -lGLEW $(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS)

9
demo/nanovg/Makefile
View File

@ -10,6 +10,13 @@ CFLAGS = -std=c99
SRC = nanovg.c ../../zahnrad.c SRC = nanovg.c ../../zahnrad.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe
LIBS = -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lm -lGLU32 -lGLEW32
else
LIBS = -lSDL2 -lGL -lm -lGLU -lGLEW
endif
# Modes # Modes
.PHONY: clang .PHONY: clang
clang: CC = clang clang: CC = clang
@ -22,4 +29,4 @@ gcc: $(BIN)
$(BIN): $(BIN):
@mkdir -p bin @mkdir -p bin
rm -f bin/$(BIN) $(OBJS) rm -f bin/$(BIN) $(OBJS)
$(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) -lSDL2 -lGL -lm -lGLU -lGLEW $(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS)

9
demo/sdl/Makefile
View File

@ -11,6 +11,13 @@ CFLAGS = -std=c89 -pedantic
SRC = ../../zahnrad.c sdl.c SRC = ../../zahnrad.c sdl.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe
LIBS = -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lm -lGLU32 -lGLEW32
else
LIBS = -lSDL2 -lGL -lm -lGLU -lGLEW
endif
# Modes # Modes
.PHONY: clang .PHONY: clang
clang: CC = clang clang: CC = clang
@ -23,4 +30,4 @@ gcc: $(BIN)
$(BIN): $(BIN):
@mkdir -p bin @mkdir -p bin
rm -f bin/$(BIN) $(OBJS) rm -f bin/$(BIN) $(OBJS)
$(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) -lSDL2 -lGL -lm -lGLU -lGLEW $(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS)

0
demo/win32/make.bat → demo/win32/make-msvc.bat
View File

3
demo/win32/win32.c
View File

@ -11,6 +11,9 @@
#include <windowsx.h> #include <windowsx.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
#endif
/* macros */ /* macros */
#include "../../zahnrad.h" #include "../../zahnrad.h"

9
example/demo/Makefile
View File

@ -9,6 +9,13 @@ CFLAGS = -std=c99
SRC = demo.c ../../zahnrad.c SRC = demo.c ../../zahnrad.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe
LIBS = -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lm -lGLU32 -lGLEW32
else
LIBS = -lSDL2 -lGL -lm -lGLU -lGLEW
endif
# Modes # Modes
.PHONY: clang .PHONY: clang
clang: CC = clang clang: CC = clang
@ -21,5 +28,5 @@ gcc: $(BIN)
$(BIN): $(BIN):
@mkdir -p bin @mkdir -p bin
rm -f bin/$(BIN) $(OBJS) rm -f bin/$(BIN) $(OBJS)
$(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) -lSDL2 -lGL -lm -lGLU -lGLEW $(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS)

9
example/filex/Makefile
View File

@ -17,6 +17,13 @@ CFLAGS += -Wswitch-enum -Winvalid-pch -Wbad-function-cast -fno-omit-frame-pointe
SRC = filex.c ../../zahnrad.c SRC = filex.c ../../zahnrad.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe
LIBS = -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lm -lGLU32 -lGLEW32
else
LIBS = -lSDL2 -lGL -lm -lGLU -lGLEW
endif
# Modes # Modes
.PHONY: clang .PHONY: clang
clang: CC = clang clang: CC = clang
@ -29,4 +36,4 @@ gcc: $(BIN)
$(BIN): $(BIN):
@mkdir -p bin @mkdir -p bin
rm -f bin/$(BIN) $(OBJS) rm -f bin/$(BIN) $(OBJS)
$(CC) $(SRC) $(CFLAGS) -D_POSIX_C_SOURCE=200809L -o bin/$(BIN) -lSDL2 -lGL -lm -lGLU -lGLEW $(CC) $(SRC) $(CFLAGS) -D_POSIX_C_SOURCE=200809L -o bin/$(BIN) $(LIBS)

10
example/filex/filex.c
View File

@ -25,16 +25,14 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#ifdef _WIN32
#error "windows is not supported"
#else
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <pwd.h> #ifndef _WIN32
# include <pwd.h>
#endif #endif
#include <GL/glew.h> #include <GL/glew.h>
@ -430,6 +428,9 @@ file_browser_init(struct file_browser *browser, NVGcontext *vg,
{ {
/* load files and sub-directory list */ /* load files and sub-directory list */
const char *home = getenv("HOME"); const char *home = getenv("HOME");
#ifdef _WIN32
if (!home) home = getenv("USERPROFILE");
#else
if (!home) home = getpwuid(getuid())->pw_dir; if (!home) home = getpwuid(getuid())->pw_dir;
{ {
size_t l; size_t l;
@ -438,6 +439,7 @@ file_browser_init(struct file_browser *browser, NVGcontext *vg,
strcpy(browser->home + l, "/"); strcpy(browser->home + l, "/");
strcpy(browser->directory, browser->home); strcpy(browser->directory, browser->home);
} }
#endif
{ {
size_t l; size_t l;
strcpy(browser->desktop, browser->home); strcpy(browser->desktop, browser->home);

9
example/nodedit/Makefile
View File

@ -10,6 +10,13 @@ CFLAGS = -std=c99 -pedantic
SRC = nodedit.c ../../zahnrad.c SRC = nodedit.c ../../zahnrad.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe
LIBS = -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lm -lGLU32 -lGLEW32
else
LIBS = -lSDL2 -lGL -lm -lGLU -lGLEW
endif
# Modes # Modes
.PHONY: clang .PHONY: clang
clang: CC = clang clang: CC = clang
@ -22,4 +29,4 @@ gcc: $(BIN)
$(BIN): $(BIN):
@mkdir -p bin @mkdir -p bin
rm -f bin/$(BIN) $(OBJS) rm -f bin/$(BIN) $(OBJS)
$(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) -lSDL2 -lGL -lm -lGLU -lGLEW $(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS)