Linker issues
This commit is contained in:
5
Makefile
5
Makefile
@@ -21,11 +21,12 @@ ifeq ($(OS), Windows_NT)
|
|||||||
PLATFORM := win32
|
PLATFORM := win32
|
||||||
PLATFORM_SRCS := $(wildcard $(SRC)/win32_*.c)
|
PLATFORM_SRCS := $(wildcard $(SRC)/win32_*.c)
|
||||||
PLATFORM_OBJS := $(patsubst $(SRC)/%.c, $(OBJ)/%.o, $(PLATFORM_SRCS))
|
PLATFORM_OBJS := $(patsubst $(SRC)/%.c, $(OBJ)/%.o, $(PLATFORM_SRCS))
|
||||||
PLATFORM_FLAGS := -D WIN32 -DUNICODE -D_UNICODE
|
PLATFORM_FLAGS := -DWIN32 -DUNICODE -D_UNICODE
|
||||||
PLATFORM_LIBS :=
|
PLATFORM_LIBS := -municode -mconsole
|
||||||
|
|
||||||
ifeq ($(CI2_GUI),1)
|
ifeq ($(CI2_GUI),1)
|
||||||
PLATFORM_LIBS += -mwindows
|
PLATFORM_LIBS += -mwindows
|
||||||
|
PLATFORM_LIBS -= -mconsole
|
||||||
PLATFORM_FLAGS += -DCI2_GUI
|
PLATFORM_FLAGS += -DCI2_GUI
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ SOFTWARE.
|
|||||||
int WINAPI ci2_wWinMain(
|
int WINAPI ci2_wWinMain(
|
||||||
HINSTANCE hInstance,
|
HINSTANCE hInstance,
|
||||||
HINSTANCE hPrevInstance,
|
HINSTANCE hPrevInstance,
|
||||||
PWSTR pCmdLine,
|
LPSTR pCmdLine,
|
||||||
int nCmdShow) {
|
int nCmdShow) {
|
||||||
// Create a console so stdout/stderr work
|
// Create a console so stdout/stderr work
|
||||||
UNUSED(hPrevInstance);
|
UNUSED(hPrevInstance);
|
||||||
@@ -71,7 +71,7 @@ int WINAPI ci2_wWinMain(
|
|||||||
}
|
}
|
||||||
|
|
||||||
int WINAPI ci2_wmain(int argc, ci2_sys_char *wargv[]) {
|
int WINAPI ci2_wmain(int argc, ci2_sys_char *wargv[]) {
|
||||||
// You already have a console because this is a console subsystem binary.
|
|
||||||
wprintf(L"Console present. argc=%d\n", argc);
|
wprintf(L"Console present. argc=%d\n", argc);
|
||||||
UNUSED(wargv);
|
UNUSED(wargv);
|
||||||
HINSTANCE hInst = GetModuleHandleW(NULL);
|
HINSTANCE hInst = GetModuleHandleW(NULL);
|
||||||
|
|||||||
Reference in New Issue
Block a user