mirror of
https://github.com/simtactics/mysimulation.git
synced 2025-03-15 14:51:21 +00:00
Added freetype under cmake. My immediate next job is libvitaboy.
This commit is contained in:
parent
17c3bb1145
commit
f9b59088a1
6 changed files with 9 additions and 6 deletions
|
@ -18,7 +18,7 @@ endif()
|
|||
|
||||
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
||||
# Base options
|
||||
set(CFLAGS "-Wall -Wextra -Wabi -m32 -mmmx -msse -msse2 -msse3 -mfpmath=both -msahf")
|
||||
set(CFLAGS "-Wall -Wextra -Wabi -pedantic -m32 -mmmx -msse -msse2 -msse3 -mfpmath=both -msahf")
|
||||
set(LDFLAGS "-m32")
|
||||
set(RCFLAGS "-F pe-i386")
|
||||
set(ASMFLAGS "-O3 -F win32")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
All you need installed to compile Niotso for Windows, Linux, or Mac is cmake 2.6 or newer, a compatible compiler (such as GCC 4.6 or newer), and NASM 2.0 or newer for libjpeg-turbo.
|
||||
All you need installed to compile Niotso for Windows, Linux, or Mac is cmake 2.6 or newer, a compatible compiler (such as GCC 4.6 or newer), and NASM 2.0 or newer for libjpeg-turbo and libmpg123.
|
||||
|
||||
cd into the _build directory and run
|
||||
$ cmake -G "<Generator name>" ..
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
add_subdirectory(libexpat)
|
||||
add_subdirectory(libfar)
|
||||
add_subdirectory(libpng)
|
||||
add_subdirectory(utk)
|
||||
add_subdirectory(xa)
|
||||
|
|
|
@ -12,8 +12,9 @@ if(WIN32)
|
|||
windows/Dialog/AddToArchive.cpp
|
||||
windows/Dialog/NewArchive.cpp
|
||||
)
|
||||
set(FARDIVE_LINK -mwindows ole32 uxtheme)
|
||||
set(FARDIVE_LINK ole32 uxtheme)
|
||||
add_executable(FARDive WIN32 ${FARDIVE_SOURCES})
|
||||
endif()
|
||||
|
||||
add_executable(FARDive ${FARDIVE_SOURCES})
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Libraries/FileHandler/libpng)
|
||||
target_link_libraries(FARDive ${FARDIVE_LINK} libpng_shared)
|
|
@ -1,5 +1,5 @@
|
|||
#include <windows.h>
|
||||
#include "../../../Libraries/FileHandler/libpng/png.h"
|
||||
#include <png.h>
|
||||
|
||||
extern HDC hDC;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "Windows.hpp"
|
||||
#include "GUI.hpp"
|
||||
#include "../../../Libraries/FileHandler/libpng/png.h"
|
||||
#include <png.h>
|
||||
|
||||
HBITMAP PNGIcon[MENUICONS];
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue